aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2011-09-21 20:55:04 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:37:17 -0800
commitf450df800450e9c7ec8c53bdb72d6c4ef5f17d4e (patch)
tree9b9300377184b368b48f031e9ff6afad454c379a /kernel
parent3fa57c1bf5fb311544199b7837a08b9f5bf5e6e4 (diff)
downloadkernel_samsung_aries-f450df800450e9c7ec8c53bdb72d6c4ef5f17d4e.zip
kernel_samsung_aries-f450df800450e9c7ec8c53bdb72d6c4ef5f17d4e.tar.gz
kernel_samsung_aries-f450df800450e9c7ec8c53bdb72d6c4ef5f17d4e.tar.bz2
PM / Suspend: Off by one in pm_suspend()
commit 528f7ce6e439edeac38f6b3f8561f1be129b5e91 upstream. In enter_state() we use "state" as an offset for the pm_states[] array. The pm_states[] array only has PM_SUSPEND_MAX elements so this test is off by one. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/suspend.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 1c41ba2..449ccc9 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -307,7 +307,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;
}