projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cpufreq] ondemand: make shutdown sequence more robust
[powerpc.git]
/
drivers
/
leds
/
ledtrig-timer.c
diff --git
a/drivers/leds/ledtrig-timer.c
b/drivers/leds/ledtrig-timer.c
index
f484b5d
..
179c287
100644
(file)
--- a/
drivers/leds/ledtrig-timer.c
+++ b/
drivers/leds/ledtrig-timer.c
@@
-11,7
+11,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-20,6
+19,7
@@
#include <linux/device.h>
#include <linux/sysdev.h>
#include <linux/timer.h>
#include <linux/device.h>
#include <linux/sysdev.h>
#include <linux/timer.h>
+#include <linux/ctype.h>
#include <linux/leds.h>
#include "leds.h"
#include <linux/leds.h>
#include "leds.h"
@@
-69,11
+69,15
@@
static ssize_t led_delay_on_store(struct class_device *dev, const char *buf,
int ret = -EINVAL;
char *after;
unsigned long state = simple_strtoul(buf, &after, 10);
int ret = -EINVAL;
char *after;
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;
mod_timer(&timer_data->timer, jiffies + 1);
timer_data->delay_on = state;
mod_timer(&timer_data->timer, jiffies + 1);
- ret =
after - buf
;
+ ret =
count
;
}
return ret;
}
return ret;
@@
-97,11
+101,15
@@
static ssize_t led_delay_off_store(struct class_device *dev, const char *buf,
int ret = -EINVAL;
char *after;
unsigned long state = simple_strtoul(buf, &after, 10);
int ret = -EINVAL;
char *after;
unsigned long state = simple_strtoul(buf, &after, 10);
+ size_t count = after - buf;
+
+ if (*after && isspace(*after))
+ count++;
- if (
after - buf > 0
) {
+ if (
count == size
) {
timer_data->delay_off = state;
mod_timer(&timer_data->timer, jiffies + 1);
timer_data->delay_off = state;
mod_timer(&timer_data->timer, jiffies + 1);
- ret =
after - buf
;
+ ret =
count
;
}
return ret;
}
return ret;