lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[105/116] leds-gpio: fix default state handling on OF platforms
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Anton Vorontsov <avorontsov@ru.mvista.com>

    commit 0493a4ff10959ff4c8e0d65efee25b7ffd4fa5db upstream.

    The driver wrongly sets default state for LEDs that don't specify
    default-state property.

    Currently the driver handles default state this way:

    memset(&led, 0, sizeof(led));
    for_each_child_of_node(np, child) {
    state = of_get_property(child, "default-state", NULL);
    if (state) {
    if (!strcmp(state, "keep"))
    led.default_state = LEDS_GPIO_DEFSTATE_KEEP;
    ...
    }
    ret = create_gpio_led(&led, ...);
    }

    Which means that all LEDs that do not specify default-state will inherit
    the last value of the default-state property, which is wrong.

    This patch fixes the issue by moving LED's template initialization into
    the loop body.

    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    --- a/drivers/leds/leds-gpio.c
    +++ b/drivers/leds/leds-gpio.c
    @@ -211,7 +211,6 @@ static int __devinit of_gpio_leds_probe(struct of_device *ofdev,
    const struct of_device_id *match)
    {
    struct device_node *np = ofdev->node, *child;
    - struct gpio_led led;
    struct gpio_led_of_platform_data *pdata;
    int count = 0, ret;

    @@ -226,8 +225,8 @@ static int __devinit of_gpio_leds_probe(struct of_device *ofdev,
    if (!pdata)
    return -ENOMEM;

    - memset(&led, 0, sizeof(led));
    for_each_child_of_node(np, child) {
    + struct gpio_led led = {};
    enum of_gpio_flags flags;
    const char *state;




    \
     
     \ /
      Last update: 2010-03-31 02:01    [W:5.845 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site