summaryrefslogtreecommitdiff
path: root/drivers/leds/leds-mc13783.c
diff options
context:
space:
mode:
authorBryan Wu <bryan.wu@canonical.com>2012-07-04 12:18:35 +0800
committerBryan Wu <bryan.wu@canonical.com>2012-07-24 07:52:39 +0800
commita44cdd2c1a527a08069d9635a9e8e1a2e9473e98 (patch)
treecb47217745fe57c780b4e7b50d11302b81965017 /drivers/leds/leds-mc13783.c
parentbcbf01624f8e551d2c3c13a2b0c394fb270fd774 (diff)
downloadlinux-3.10-a44cdd2c1a527a08069d9635a9e8e1a2e9473e98.tar.gz
linux-3.10-a44cdd2c1a527a08069d9635a9e8e1a2e9473e98.tar.bz2
linux-3.10-a44cdd2c1a527a08069d9635a9e8e1a2e9473e98.zip
leds: convert Freescale MC13783 LED driver to devm_kzalloc() and cleanup error exit path
Cc: Philippe Retornaz <philippe.retornaz@epfl.ch> Signed-off-by: Bryan Wu <bryan.wu@canonical.com>
Diffstat (limited to 'drivers/leds/leds-mc13783.c')
-rw-r--r--drivers/leds/leds-mc13783.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/leds/leds-mc13783.c b/drivers/leds/leds-mc13783.c
index 6515c11dbe6..2a5d4340067 100644
--- a/drivers/leds/leds-mc13783.c
+++ b/drivers/leds/leds-mc13783.c
@@ -280,7 +280,8 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev)
return -EINVAL;
}
- led = kcalloc(pdata->num_leds, sizeof(*led), GFP_KERNEL);
+ led = devm_kzalloc(&pdev->dev, pdata->num_leds * sizeof(*led),
+ GFP_KERNEL);
if (led == NULL) {
dev_err(&pdev->dev, "failed to alloc memory\n");
return -ENOMEM;
@@ -289,7 +290,7 @@ static int __devinit mc13783_led_probe(struct platform_device *pdev)
ret = mc13783_leds_prepare(pdev);
if (ret) {
dev_err(&pdev->dev, "unable to init led driver\n");
- goto err_free;
+ return ret;
}
for (i = 0; i < pdata->num_leds; i++) {
@@ -344,8 +345,6 @@ err_register:
cancel_work_sync(&led[i].work);
}
-err_free:
- kfree(led);
return ret;
}
@@ -373,7 +372,6 @@ static int __devexit mc13783_led_remove(struct platform_device *pdev)
mc13xxx_unlock(dev);
platform_set_drvdata(pdev, NULL);
- kfree(led);
return 0;
}