Merge branch 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds

Pull LED subsystem update from Bryan Wu.

* 'for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds: (50 commits)
  leds-lp8788: forgotten unlock at lp8788_led_work
  LEDS: propagate error codes in blinkm_detect()
  LEDS: memory leak in blinkm_led_common_set()
  leds: add new lp8788 led driver
  LEDS: add BlinkM RGB LED driver, documentation and update MAINTAINERS
  leds: max8997: Simplify max8997_led_set_mode implementation
  leds/leds-s3c24xx: use devm_gpio_request
  leds: convert Network Space v2 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert DAC124S085 LED driver to devm_kzalloc()
  leds: convert LM3530 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert TCA6507 LED driver to devm_kzalloc()
  leds: convert Freescale MC13783 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert ADP5520 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert PCA955x LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert Sun Fire LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert PCA9532 LED driver to devm_kzalloc()
  leds: convert LT3593 LED driver to devm_kzalloc()
  leds: convert Renesas TPU LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert LP5523 LED driver to devm_kzalloc() and cleanup error exit path
  leds: convert PCA9633 LED driver to devm_kzalloc()
  ...

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index f4c470a3bc8d..c032b2180340 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -178,7 +178,8 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev
         if (!count)
                 return NULL;
 
-        priv = kzalloc(sizeof_gpio_leds_priv(count), GFP_KERNEL);
+        priv = devm_kzalloc(&pdev->dev, sizeof_gpio_leds_priv(count),
+                        GFP_KERNEL);
         if (!priv)
                 return NULL;
 
@@ -215,7 +216,6 @@ static struct gpio_leds_priv * __devinit gpio_leds_create_of(struct platform_dev
 err:
         for (count = priv->num_leds - 2; count >= 0; count--)
                 delete_gpio_led(&priv->leds[count]);
-        kfree(priv);
         return NULL;
 }
 
@@ -239,8 +239,9 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
         int i, ret = 0;
 
         if (pdata && pdata->num_leds) {
-                priv = kzalloc(sizeof_gpio_leds_priv(pdata->num_leds),
-                                GFP_KERNEL);
+                priv = devm_kzalloc(&pdev->dev,
+                                sizeof_gpio_leds_priv(pdata->num_leds),
+                                        GFP_KERNEL);
                 if (!priv)
                         return -ENOMEM;
 
@@ -253,7 +254,6 @@ static int __devinit gpio_led_probe(struct platform_device *pdev)
                                 /* On failure: unwind the led creations */
                                 for (i = i - 1; i >= 0; i--)
                                         delete_gpio_led(&priv->leds[i]);
-                                kfree(priv);
                                 return ret;
                         }
                 }
@@ -277,7 +277,6 @@ static int __devexit gpio_led_remove(struct platform_device *pdev)
                 delete_gpio_led(&priv->leds[i]);
 
         dev_set_drvdata(&pdev->dev, NULL);
-        kfree(priv);
 
         return 0;
 }