diff options
| author | Dan Murphy <dmurphy@ti.com> | 2012-02-02 14:16:57 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2012-02-02 14:19:13 -0600 |
| commit | 04cc23436ebc4f0caf088a97ef9404ea71acfdd1 (patch) | |
| tree | 9994f9a05d68e47e51368017288c157936e9e1cd /kernel/power | |
| parent | 50725abe80c6893a7134977c8b576a0ec4eef5a5 (diff) | |
| parent | 235eae6e5e402f5f723203e4444f10c16c7c3be3 (diff) | |
| download | kernel_samsung_espresso10-04cc23436ebc4f0caf088a97ef9404ea71acfdd1.tar.gz kernel_samsung_espresso10-04cc23436ebc4f0caf088a97ef9404ea71acfdd1.tar.bz2 kernel_samsung_espresso10-04cc23436ebc4f0caf088a97ef9404ea71acfdd1.zip | |
Merge branch 'linux-3.0.18' into p-android-omap-3.0
Conflicts:
arch/arm/mach-omap2/smartreflex.c
drivers/i2c/busses/i2c-omap.c
drivers/usb/host/ehci.h
drivers/usb/musb/musb_core.c
fs/proc/base.c
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/suspend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 63774df522b..61e63472816 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -310,7 +310,7 @@ int enter_state(suspend_state_t state) */ int pm_suspend(suspend_state_t state) { - if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX) + if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX) return enter_state(state); return -EINVAL; } |