[PATCH v2] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe

[PATCH v2] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe

[Axel Lin]

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>
---
 drivers/leds/leds-lp3944.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
index 8d5ecce..932a58d 100644
--- 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;
 }
 
-- 
1.5.4.3

Re: [PATCH v2] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

On Mon, May 17, 2010 at 05:47:48PM +0800, Axel Lin wrote:
> 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>

Looks good to me.

Acked-by: Wolfram Sang <w.sang@pengutronix.de>

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH v2] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe

[Antonio Ospite]

[-- Attachment #1: Type: text/plain, Size: 772 bytes --]

On Mon, 17 May 2010 17:47:48 +0800
Axel Lin <axel.lin@gmail.com> wrote:

> 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: Antonio Ospite <ospite@studenti.unina.it>

Thanks.

-- 
Antonio Ospite
http://ao2.it

PGP public key ID: 0x4553B001

A: Because it messes up the order in which people normally read text.
   See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing in e-mail?

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe

[Richard Purdie]

On Mon, 2010-05-17 at 12:15 +0200, Antonio Ospite wrote:
> On Mon, 17 May 2010 17:47:48 +0800
> Axel Lin <axel.lin@gmail.com> wrote:
> 
> > 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: Antonio Ospite <ospite@studenti.unina.it>
> 

Queued in the leds tree, thanks.

Richard