joel16/android_kernel_sony_msm8994
1
0
Fork 0
mirror of https://github.com/joel16/android_kernel_sony_msm8994.git synced 2024-12-13 23:50:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] LED: Fix sysfs store function error handling

Browse Source 
Fix the error handling of some LED _store functions.  This corrects them to
return -EINVAL if the value is not numeric with an optional byte of trailing
whitespace.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Richard Purdie 2006-05-15 09:44:17 -07:00 committed by Linus Torvalds
parent 263de9b582
commit 3dc7b82ea7
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/leds/led-class.c
View File

@ -19,6 +19,7 @@
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/ctype.h>
#include <linux/leds.h> #include <linux/leds.h>
#include "leds.h" #include "leds.h"
@ -43,9 +44,13 @@ static ssize_t led_brightness_store(struct class_device *dev,
ssize_t ret = -EINVAL; ssize_t ret = -EINVAL;
char *after; char *after;
unsigned long state = simple_strtoul(buf, &after, 10); unsigned long state = simple_strtoul(buf, &after, 10);
size_t count = after - buf;
if (after - buf > 0) { if (*after && isspace(*after))
ret = after - buf; count++;
if (count == size) {
ret = count;
led_set_brightness(led_cdev, state); led_set_brightness(led_cdev, state);
} }

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

@ -20,6 +20,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/sysdev.h> #include <linux/sysdev.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/ctype.h>
#include <linux/leds.h> #include <linux/leds.h>
#include "leds.h" #include "leds.h"
@ -69,11 +70,15 @@ static ssize_t led_delay_on_store(struct class_device *dev, const char *buf,
int ret = -EINVAL; int ret = -EINVAL;
char *after; char *after;
unsigned long state = simple_strtoul(buf, &after, 10); unsigned long state = simple_strtoul(buf, &after, 10);
size_t count = after - buf;
if (after - buf > 0) { if (*after && isspace(*after))
count++;
if (count == size) {
timer_data->delay_on = state; timer_data->delay_on = state;
mod_timer(&timer_data->timer, jiffies + 1); mod_timer(&timer_data->timer, jiffies + 1);
ret = after - buf; ret = count;
} }
return ret; return ret;
@ -97,11 +102,15 @@ static ssize_t led_delay_off_store(struct class_device *dev, const char *buf,
int ret = -EINVAL; int ret = -EINVAL;
char *after; char *after;
unsigned long state = simple_strtoul(buf, &after, 10); unsigned long state = simple_strtoul(buf, &after, 10);
size_t count = after - buf;
if (after - buf > 0) { if (*after && isspace(*after))
count++;
if (count == size) {
timer_data->delay_off = state; timer_data->delay_off = state;
mod_timer(&timer_data->timer, jiffies + 1); mod_timer(&timer_data->timer, jiffies + 1);
ret = after - buf; ret = count;
} }
return ret; return ret;