* [PATCH] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
@ 2010-05-17 1:34 Axel Lin
2010-05-17 9:15 ` Antonio Ospite
0 siblings, 1 reply; 4+ messages in thread
From: Axel Lin @ 2010-05-17 1:34 UTC (permalink / raw)
To: linux-kernel; +Cc: Antonio Ospite, Richard Purdie
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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
index 8d5ecce..03a24d0 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");
@@ -403,8 +404,15 @@ static int __devinit lp3944_probe(struct i2c_client *client,
dev_info(&client->dev, "lp3944 enabled\n");
- lp3944_configure(client, data, lp3944_pdata);
+ err = lp3944_configure(client, data, lp3944_pdata);
+ if (err < 0)
+ goto err_configure;
+
return 0;
+
+err_configure:
+ kfree(data);
+ return err;
}
static int __devexit lp3944_remove(struct i2c_client *client)
--
1.5.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
2010-05-17 1:34 [PATCH] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe Axel Lin
@ 2010-05-17 9:15 ` Antonio Ospite
2010-05-17 9:24 ` Wolfram Sang
2010-05-17 9:52 ` Axel Lin
0 siblings, 2 replies; 4+ messages in thread
From: Antonio Ospite @ 2010-05-17 9:15 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Richard Purdie
[-- Attachment #1: Type: text/plain, Size: 2348 bytes --]
On Mon, 17 May 2010 09:34:02 +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.
>
Hi Axel, thanks for the fix, I agree it's needed.
There are some minor comments inlined below.
Plus, when possible, I prefer commit messages to be wrapped to 72/80
characters per line. Please, consider this if you are sending a v2.
Ah, may I ask where you are using this driver? Just curious.
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> drivers/leds/leds-lp3944.c | 10 +++++++++-
> 1 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
> index 8d5ecce..03a24d0 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");
> @@ -403,8 +404,15 @@ static int __devinit lp3944_probe(struct i2c_client *client,
>
> dev_info(&client->dev, "lp3944 enabled\n");
>
> - lp3944_configure(client, data, lp3944_pdata);
> + err = lp3944_configure(client, data, lp3944_pdata);
> + if (err < 0)
> + goto err_configure;
> +
The dev_info(&client->dev, "lp3944 enabled\n"); could now go right
here, before the return 0, so we don't report the driver as enabled
even in the case its probe fails.
> return 0;
> +
> +err_configure:
> + kfree(data);
add i2c_set_clientdata(client, NULL) here just like in lp3944_remove()
> + return err;
> }
>
> static int __devexit lp3944_remove(struct i2c_client *client)
> --
> 1.5.4.3
>
Regards,
Antonio
--
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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
2010-05-17 9:15 ` Antonio Ospite
@ 2010-05-17 9:24 ` Wolfram Sang
2010-05-17 9:52 ` Axel Lin
1 sibling, 0 replies; 4+ messages in thread
From: Wolfram Sang @ 2010-05-17 9:24 UTC (permalink / raw)
To: Antonio Ospite; +Cc: Axel Lin, linux-kernel, Richard Purdie
[-- Attachment #1: Type: text/plain, Size: 2401 bytes --]
On Mon, May 17, 2010 at 11:15:13AM +0200, Antonio Ospite wrote:
> On Mon, 17 May 2010 09:34:02 +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.
> >
>
> Hi Axel, thanks for the fix, I agree it's needed.
> There are some minor comments inlined below.
>
> Plus, when possible, I prefer commit messages to be wrapped to 72/80
> characters per line. Please, consider this if you are sending a v2.
>
> Ah, may I ask where you are using this driver? Just curious.
>
> > Signed-off-by: Axel Lin <axel.lin@gmail.com>
> > ---
> > drivers/leds/leds-lp3944.c | 10 +++++++++-
> > 1 files changed, 9 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
> > index 8d5ecce..03a24d0 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");
> > @@ -403,8 +404,15 @@ static int __devinit lp3944_probe(struct i2c_client *client,
> >
> > dev_info(&client->dev, "lp3944 enabled\n");
> >
> > - lp3944_configure(client, data, lp3944_pdata);
> > + err = lp3944_configure(client, data, lp3944_pdata);
> > + if (err < 0)
> > + goto err_configure;
> > +
>
> The dev_info(&client->dev, "lp3944 enabled\n"); could now go right
> here, before the return 0, so we don't report the driver as enabled
> even in the case its probe fails.
>
> > return 0;
> > +
> > +err_configure:
> > + kfree(data);
>
> add i2c_set_clientdata(client, NULL) here just like in lp3944_remove()
Just to note:
This is not needed anymore, the i2c-core does this meanwhile for the drivers.
I am preparing a cleanup patch fixing this in all drivers for -rc1.
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe
2010-05-17 9:15 ` Antonio Ospite
2010-05-17 9:24 ` Wolfram Sang
@ 2010-05-17 9:52 ` Axel Lin
1 sibling, 0 replies; 4+ messages in thread
From: Axel Lin @ 2010-05-17 9:52 UTC (permalink / raw)
To: Antonio Ospite; +Cc: linux-kernel, Richard Purdie
2010/5/17 Antonio Ospite <ospite@studenti.unina.it>:
> On Mon, 17 May 2010 09:34:02 +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.
>>
>
> Hi Axel, thanks for the fix, I agree it's needed.
> There are some minor comments inlined below.
>
> Plus, when possible, I prefer commit messages to be wrapped to 72/80
> characters per line. Please, consider this if you are sending a v2.
ok. done in v2.
>
> Ah, may I ask where you are using this driver? Just curious.
>
>> Signed-off-by: Axel Lin <axel.lin@gmail.com>
>> ---
>> drivers/leds/leds-lp3944.c | 10 +++++++++-
>> 1 files changed, 9 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c
>> index 8d5ecce..03a24d0 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");
>> @@ -403,8 +404,15 @@ static int __devinit lp3944_probe(struct i2c_client *client,
>>
>> dev_info(&client->dev, "lp3944 enabled\n");
>>
>> - lp3944_configure(client, data, lp3944_pdata);
>> + err = lp3944_configure(client, data, lp3944_pdata);
>> + if (err < 0)
>> + goto err_configure;
>> +
>
> The dev_info(&client->dev, "lp3944 enabled\n"); could now go right
> here, before the return 0, so we don't report the driver as enabled
> even in the case its probe fails.
done in v2.
>
>> return 0;
>> +
>> +err_configure:
>> + kfree(data);
>
> add i2c_set_clientdata(client, NULL) here just like in lp3944_remove()
per Wolfram Sang's comment, I skip this part in v2.
>
>> + return err;
>> }
>>
>> static int __devexit lp3944_remove(struct i2c_client *client)
>> --
>> 1.5.4.3
>>
>
> Regards,
> Antonio
>
> --
> 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?
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-05-17 9:52 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-17 1:34 [PATCH] leds-lp3944: properly handle lp3944_configure fail in lp3944_probe Axel Lin
2010-05-17 9:15 ` Antonio Ospite
2010-05-17 9:24 ` Wolfram Sang
2010-05-17 9:52 ` Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox