Commit ec98a497 authored Nov 06, 2014 by Geert Uytterhoeven Committed by Rafael J. Wysocki Nov 06, 2014

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: 5c51277a (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>

parent 60ba032e

drivers/leds/leds-gpio.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message