git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
pm-debug.c
diff --git
a/arch/arm/mach-omap2/pm-debug.c
b/arch/arm/mach-omap2/pm-debug.c
index
6cac981
..
723b44e
100644
(file)
--- a/
arch/arm/mach-omap2/pm-debug.c
+++ b/
arch/arm/mach-omap2/pm-debug.c
@@
-548,6
+548,9
@@
static int option_set(void *data, u64 val)
{
u32 *option = data;
+ if (option == &wakeup_timer_milliseconds && val >= 1000)
+ return -EINVAL;
+
*option = val;
if (option == &enable_off_mode)