diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-11-06 12:23:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-11-06 21:34:21 +0100 |
| commit | ec98a4975e66a3aa366cd227edab027b01adea37 (patch) | |
| tree | 766cafb359e4a53d961840c0d2f0761a56584aeb /drivers/leds | |
| parent | 60ba032ed76e851d30d4fa514847285252147d07 (diff) | |
| download | talos-obmc-linux-ec98a4975e66a3aa366cd227edab027b01adea37.tar.gz talos-obmc-linux-ec98a4975e66a3aa366cd227edab027b01adea37.zip | |
leds: leds-gpio: Fix legacy GPIO number case
In the legacy case, led_dat->gpiod is initialized correctly, but
overwritten later by template->gpiod, which is NULL, causing leds-gpio
to fail with:
gpiod_direction_output: invalid GPIO
leds-gpio: probe of leds-gpio failed with error -22
Move the initialization of led_dat->gpiod from template->gpiod up, and
always use led_dat->gpiod later, to fix this.
Fixes: 5c51277a9ababfa4 (leds: leds-gpio: Add support for GPIO descriptors)
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/leds')
| -rw-r--r-- | drivers/leds/leds-gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index ba4698c32bb0..b3c5d9d6a42b 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -92,7 +92,8 @@ static int create_gpio_led(const struct gpio_led *template, { int ret, state; - if (!template->gpiod) { + led_dat->gpiod = template->gpiod; + if (!led_dat->gpiod) { /* * This is the legacy code path for platform code that * still uses GPIO numbers. Ultimately we would like to get @@ -122,8 +123,7 @@ static int create_gpio_led(const struct gpio_led *template, led_dat->cdev.name = template->name; led_dat->cdev.default_trigger = template->default_trigger; - led_dat->gpiod = template->gpiod; - led_dat->can_sleep = gpiod_cansleep(template->gpiod); + led_dat->can_sleep = gpiod_cansleep(led_dat->gpiod); led_dat->blinking = 0; if (blink_set) { led_dat->platform_gpio_blink_set = blink_set; |
