iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking

Browse Source 
Replicate changes made to drivers/leds/ledtrig-backlight.c.

Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Janusz Krzysztofik 2011-01-20 14:44:29 -08:00 committed by Linus Torvalds
parent c1fc8675c9
commit cc587ece12
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/leds/ledtrig-gpio.c
View File

@ -99,7 +99,7 @@ static ssize_t gpio_trig_inverted_show(struct device *dev,
struct led_classdev *led = dev_get_drvdata(dev); struct led_classdev *led = dev_get_drvdata(dev);
struct gpio_trig_data *gpio_data = led->trigger_data; struct gpio_trig_data *gpio_data = led->trigger_data;
return sprintf(buf, "%s\n", gpio_data->inverted ? "yes" : "no"); return sprintf(buf, "%u\n", gpio_data->inverted);
} }
static ssize_t gpio_trig_inverted_store(struct device *dev, static ssize_t gpio_trig_inverted_store(struct device *dev,
@ -107,16 +107,17 @@ static ssize_t gpio_trig_inverted_store(struct device *dev,
{ {
struct led_classdev *led = dev_get_drvdata(dev); struct led_classdev *led = dev_get_drvdata(dev);
struct gpio_trig_data *gpio_data = led->trigger_data; struct gpio_trig_data *gpio_data = led->trigger_data;
unsigned inverted; unsigned long inverted;
int ret; int ret;
ret = sscanf(buf, "%u", &inverted); ret = strict_strtoul(buf, 10, &inverted);
if (ret < 1) { if (ret < 0)
dev_err(dev, "invalid value\n"); return ret;
return -EINVAL;
}
gpio_data->inverted = !!inverted; if (inverted > 1)
return -EINVAL;
gpio_data->inverted = inverted;
/* After inverting, we need to update the LED. */ /* After inverting, we need to update the LED. */
schedule_work(&gpio_data->work); schedule_work(&gpio_data->work);