leds: leds-lp3944: properly handle lp3944_configure fail in lp3944_probe

In current implementation, lp3944_probe return 0 even if lp3944_configure fail.
Therefore, led_classdev_unregister will be executed twice
( in error handling of lp3944_configure and lp3944_remove ).
This patch properly handles lp3944_configure fail in lp3944_probe.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
index 8d5ecce..932a58d 100644 (file)
--- a/drivers/leds/leds-lp3944.c
+++ b/drivers/leds/leds-lp3944.c
@@ -379,6 +379,7 @@ static int __devinit lp3944_probe(struct i2c_client *client,
 {
        struct lp3944_platform_data *lp3944_pdata = client->dev.platform_data;
        struct lp3944_data *data;
+       int err;
 
        if (lp3944_pdata == NULL) {
                dev_err(&client->dev, "no platform data\n");
@@ -401,9 +402,13 @@ static int __devinit lp3944_probe(struct i2c_client *client,
 
        mutex_init(&data->lock);
 
-       dev_info(&client->dev, "lp3944 enabled\n");
+       err = lp3944_configure(client, data, lp3944_pdata);
+       if (err < 0) {
+               kfree(data);
+               return err;
+       }
 
-       lp3944_configure(client, data, lp3944_pdata);
+       dev_info(&client->dev, "lp3944 enabled\n");
        return 0;
 }