hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

leds: trigger: gpio: GPIO 0 is valid 

Allow all valid GPIOs to be used in the driver.

Fixes: 17354bfe85 ("leds: Add gpio-led trigger")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
This commit is contained in:
Andy Shevchenko 2019-08-30 18:08:19 +03:00 committed by Jacek Anaszewski
parent d4b02200ae
commit 4e42104026
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/leds/trigger/ledtrig-gpio.c
View File

@ -131,10 +131,10 @@ static ssize_t gpio_trig_gpio_store(struct device *dev,
if (gpio_data->gpio == gpio) if (gpio_data->gpio == gpio)
return n; return n;
if (!gpio) { if (!gpio_is_valid(gpio)) {
if (gpio_data->gpio != 0) if (gpio_is_valid(gpio_data->gpio))
free_irq(gpio_to_irq(gpio_data->gpio), led); free_irq(gpio_to_irq(gpio_data->gpio), led);
gpio_data->gpio = 0; gpio_data->gpio = gpio;
return n; return n;
} }
@ -144,7 +144,7 @@ static ssize_t gpio_trig_gpio_store(struct device *dev,
if (ret) { if (ret) {
dev_err(dev, "request_irq failed with error %d\n", ret); dev_err(dev, "request_irq failed with error %d\n", ret);
} else { } else {
if (gpio_data->gpio != 0) if (gpio_is_valid(gpio_data->gpio))
free_irq(gpio_to_irq(gpio_data->gpio), led); free_irq(gpio_to_irq(gpio_data->gpio), led);
gpio_data->gpio = gpio; gpio_data->gpio = gpio;
/* After changing the GPIO, we need to update the LED. */ /* After changing the GPIO, we need to update the LED. */
@ -172,6 +172,8 @@ static int gpio_trig_activate(struct led_classdev *led)
return -ENOMEM; return -ENOMEM;
gpio_data->led = led; gpio_data->led = led;
gpio_data->gpio = -ENOENT;
led_set_trigger_data(led, gpio_data); led_set_trigger_data(led, gpio_data);
return 0; return 0;
@ -181,7 +183,7 @@ static void gpio_trig_deactivate(struct led_classdev *led)
{ {
struct gpio_trig_data *gpio_data = led_get_trigger_data(led); struct gpio_trig_data *gpio_data = led_get_trigger_data(led);
if (gpio_data->gpio != 0) if (gpio_is_valid(gpio_data->gpio))
free_irq(gpio_to_irq(gpio_data->gpio), led); free_irq(gpio_to_irq(gpio_data->gpio), led);
kfree(gpio_data); kfree(gpio_data);
} }