diff options
| author | Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> | 2011-11-19 14:37:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-11-19 14:37:57 +0100 |
| commit | 501a708f18ef911328ffd39f39738b8a7862aa8e (patch) | |
| tree | f3adbf5979f9e714291cec5c2a893edbca16ba26 /kernel/power | |
| parent | aa9a7b11821e883a7b93ecce190881e0ea48648b (diff) | |
| download | op-kernel-dev-501a708f18ef911328ffd39f39738b8a7862aa8e.zip op-kernel-dev-501a708f18ef911328ffd39f39738b8a7862aa8e.tar.gz | |
PM / Suspend: Fix bug in suspend statistics update
After commit 2a77c46de1e3dace73745015635ebbc648eca69c
(PM / Suspend: Add statistics debugfs file for suspend to RAM)
a missing pair of braces inside the state_store() function causes even
invalid arguments to suspend to be wrongly treated as failed suspend
attempts. Fix this.
[rjw: Put the hash/subject of the buggy commit into the changelog.]
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 71f49fe..36e0f09 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -290,13 +290,14 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr, if (*s && len == strlen(*s) && !strncmp(buf, *s, len)) break; } - if (state < PM_SUSPEND_MAX && *s) + if (state < PM_SUSPEND_MAX && *s) { error = enter_state(state); if (error) { suspend_stats.fail++; dpm_save_failed_errno(error); } else suspend_stats.success++; + } #endif Exit: |
