2014-12-09 16:47:39

by Fabio Estevam

Subject: [PATCH] leds: leds-gpio: Fix the "default-state" property check

Commit a43f2cbbb009f9 ("leds: leds-gpio: Make use of device property API")
caused a regression by reading the incorrect string for the "default-state"
property.

Fix the property string check to restore the original behaviour.

Fixes: a43f2cbbb009 (leds: leds-gpio: Make use of device property API)
Reported-by: Jean-Michel Hautbois <[email protected]>
Signed-off-by: Fabio Estevam <[email protected]>
---
drivers/leds/leds-gpio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 8a8ba11..7ea1ea42 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -203,7 +203,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
fwnode_property_read_string(child, "linux,default-trigger",
&led.default_trigger);

- if (!fwnode_property_read_string(child, "linux,default_state",
+ if (!fwnode_property_read_string(child, "default-state",
&state)) {
if (!strcmp(state, "keep"))
led.default_state = LEDS_GPIO_DEFSTATE_KEEP;
--
1.9.1

2014-12-09 19:14:09

by Bryan Wu

Subject: Re: [PATCH] leds: leds-gpio: Fix the "default-state" property check

On Tue, Dec 9, 2014 at 8:31 AM, Fabio Estevam
<[email protected]> wrote:
> Commit a43f2cbbb009f9 ("leds: leds-gpio: Make use of device property API")
> caused a regression by reading the incorrect string for the "default-state"
> property.
>
> Fix the property string check to restore the original behaviour.
>
> Fixes: a43f2cbbb009 (leds: leds-gpio: Make use of device property API)

Thanks, please take my Ack
Acked-by: Bryan Wu <[email protected]>

I think Rafael will take this fix with other patches through his tree.


> Reported-by: Jean-Michel Hautbois <[email protected]>
> Signed-off-by: Fabio Estevam <[email protected]>
> ---
> drivers/leds/leds-gpio.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
> index 8a8ba11..7ea1ea42 100644
> --- a/drivers/leds/leds-gpio.c
> +++ b/drivers/leds/leds-gpio.c
> @@ -203,7 +203,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
> fwnode_property_read_string(child, "linux,default-trigger",
> &led.default_trigger);
>
> - if (!fwnode_property_read_string(child, "linux,default_state",
> + if (!fwnode_property_read_string(child, "default-state",
> &state)) {
> if (!strcmp(state, "keep"))
> led.default_state = LEDS_GPIO_DEFSTATE_KEEP;
> --
> 1.9.1
>

2014-12-10 01:12:59

by Wysocki, Rafael J

Subject: Re: [PATCH] leds: leds-gpio: Fix the "default-state" property check

On 12/9/2014 8:13 PM, Bryan Wu wrote:
> On Tue, Dec 9, 2014 at 8:31 AM, Fabio Estevam
> <[email protected]> wrote:
>> Commit a43f2cbbb009f9 ("leds: leds-gpio: Make use of device property API")
>> caused a regression by reading the incorrect string for the "default-state"
>> property.
>>
>> Fix the property string check to restore the original behaviour.
>>
>> Fixes: a43f2cbbb009 (leds: leds-gpio: Make use of device property API)
> Thanks, please take my Ack
> Acked-by: Bryan Wu <[email protected]>
>
> I think Rafael will take this fix with other patches through his tree.

Yes, I will, thanks!

And sorry for the breakage ...

>
>> Reported-by: Jean-Michel Hautbois <[email protected]>
>> Signed-off-by: Fabio Estevam <[email protected]>
>> ---
>> drivers/leds/leds-gpio.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
>> index 8a8ba11..7ea1ea42 100644
>> --- a/drivers/leds/leds-gpio.c
>> +++ b/drivers/leds/leds-gpio.c
>> @@ -203,7 +203,7 @@ static struct gpio_leds_priv *gpio_leds_create(struct platform_device *pdev)
>> fwnode_property_read_string(child, "linux,default-trigger",
>> &led.default_trigger);
>>
>> - if (!fwnode_property_read_string(child, "linux,default_state",
>> + if (!fwnode_property_read_string(child, "default-state",
>> &state)) {
>> if (!strcmp(state, "keep"))
>> led.default_state = LEDS_GPIO_DEFSTATE_KEEP;
>> --
>> 1.9.1
>>