From b7c590a4a3e81d610354d4bf12a8c4d12cb06e5b Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Mon, 2 Jul 2012 18:15:43 +0800 Subject: [PATCH] --- yaml --- r: 318973 b: refs/heads/master c: b523cfe61b097a45f4e919e8c3b6da239962b3e9 h: refs/heads/master i: 318971: bcdc89453815061d118cca6dae2ce6c29ce172c8 v: v3 --- [refs] | 2 +- trunk/drivers/leds/leds-88pm860x.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fd6e3bf116b3..6ca4f39ba0b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5391dd0a9d084633e20e6583cfed233581c452f9 +refs/heads/master: b523cfe61b097a45f4e919e8c3b6da239962b3e9 diff --git a/trunk/drivers/leds/leds-88pm860x.c b/trunk/drivers/leds/leds-88pm860x.c index 5b61aaf7ac0f..61897cfeeda6 100644 --- a/trunk/drivers/leds/leds-88pm860x.c +++ b/trunk/drivers/leds/leds-88pm860x.c @@ -209,7 +209,7 @@ static int pm860x_led_probe(struct platform_device *pdev) return -EINVAL; } - data = kzalloc(sizeof(struct pm860x_led), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_led), GFP_KERNEL); if (data == NULL) return -ENOMEM; strncpy(data->name, res->name, MFD_NAME_SIZE - 1); @@ -220,7 +220,6 @@ static int pm860x_led_probe(struct platform_device *pdev) data->port = pdata->flags; if (data->port < 0) { dev_err(&pdev->dev, "check device failed\n"); - kfree(data); return -EINVAL; } @@ -233,13 +232,10 @@ static int pm860x_led_probe(struct platform_device *pdev) ret = led_classdev_register(chip->dev, &data->cdev); if (ret < 0) { dev_err(&pdev->dev, "Failed to register LED: %d\n", ret); - goto out; + return ret; } pm860x_led_set(&data->cdev, 0); return 0; -out: - kfree(data); - return ret; } static int pm860x_led_remove(struct platform_device *pdev) @@ -247,7 +243,6 @@ static int pm860x_led_remove(struct platform_device *pdev) struct pm860x_led *data = platform_get_drvdata(pdev); led_classdev_unregister(&data->cdev); - kfree(data); return 0; }