From 43082f80c81d9dcdff53ab0d51235fd4cc318426 Mon Sep 17 00:00:00 2001
From: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Date: Sat, 30 Jun 2012 20:30:25 +0800
Subject: [PATCH] --- yaml --- r: 318975 b: refs/heads/master c:
 7e97b58133b7cddf3be80660300bb2c77c514c6f h: refs/heads/master i:   318973:
 b7c590a4a3e81d610354d4bf12a8c4d12cb06e5b   318971:
 bcdc89453815061d118cca6dae2ce6c29ce172c8   318967:
 109bc5db1263b00121023905cac7cc70e3e033b1   318959:
 e7d441b1290a10299df377809d1fec065a9c9172   318943:
 99ec5ce8cbca0ac03ba98bda588c4ccac78e1ca6   318911:
 36ce32c568e6524cee91735f5304ad46de33bc64   318847:
 3f1e945a183d42f15745834051bb2f5f2e4ae266   318719:
 e36cabd698143e4e1cd447f4309519a38e947e14   318463:
 ce95fe4fdbe961a8938394a092ad5303fac990b5 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/leds/leds-s3c24xx.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 806e18e5a3a6..a40db27b71cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 317dfb148d606a92e7d2748ab77f3d8f9749cc8a
+refs/heads/master: 7e97b58133b7cddf3be80660300bb2c77c514c6f
diff --git a/trunk/drivers/leds/leds-s3c24xx.c b/trunk/drivers/leds/leds-s3c24xx.c
index e6ee10548265..b816ccb9adf4 100644
--- a/trunk/drivers/leds/leds-s3c24xx.c
+++ b/trunk/drivers/leds/leds-s3c24xx.c
@@ -63,7 +63,6 @@ static int s3c24xx_led_remove(struct platform_device *dev)
 	struct s3c24xx_gpio_led *led = pdev_to_gpio(dev);
 
 	led_classdev_unregister(&led->cdev);
-	kfree(led);
 
 	return 0;
 }
@@ -74,7 +73,8 @@ static int s3c24xx_led_probe(struct platform_device *dev)
 	struct s3c24xx_gpio_led *led;
 	int ret;
 
-	led = kzalloc(sizeof(struct s3c24xx_gpio_led), GFP_KERNEL);
+	led = devm_kzalloc(&dev->dev, sizeof(struct s3c24xx_gpio_led),
+			   GFP_KERNEL);
 	if (led == NULL) {
 		dev_err(&dev->dev, "No memory for device\n");
 		return -ENOMEM;
@@ -103,10 +103,8 @@ static int s3c24xx_led_probe(struct platform_device *dev)
 	/* register our new led device */
 
 	ret = led_classdev_register(&dev->dev, &led->cdev);
-	if (ret < 0) {
+	if (ret < 0)
 		dev_err(&dev->dev, "led_classdev_register failed\n");
-		kfree(led);
-	}
 
 	return ret;
 }