Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d98a690 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

swsusp: fix sysfs interface 



The sysfs files /sys/power/disk and /sys/power/state do not work as
documented, since they allow the user to write only a few initial
characters of the input string to trigger the option (eg.  'echo pl >
/sys/power/disk' activates the platform mode of hibernation).  Fix it.

Special thanks to Peter Moulder <Peter.Moulder@infotech.monash.edu.au> for
pointing out the problem.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7925409e

kernel/power/disk.c

+2 −1
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ static ssize_t disk_store(struct kset *kset, const char *buf, size_t n) 


	mutex_lock(&pm_mutex);

	for (i = HIBERNATION_FIRST; i <= HIBERNATION_MAX; i++) {

		if (!strncmp(buf, hibernation_modes[i], len)) {

		if (len == strlen(hibernation_modes[i])

		    && !strncmp(buf, hibernation_modes[i], len)) {

			mode = i;

			break;

		}

kernel/power/main.c

+2 −2
Original line number Diff line number Diff line
@@ -290,13 +290,13 @@ static ssize_t state_store(struct kset *kset, const char *buf, size_t n) 
	len = p ? p - buf : n;



	/* First, check if we are requested to hibernate */

	if (!strncmp(buf, "disk", len)) {

	if (len == 4 && !strncmp(buf, "disk", len)) {

		error = hibernate();

		return error ? error : n;

	}



	for (s = &pm_states[state]; state < PM_SUSPEND_MAX; s++, state++) {

		if (*s && !strncmp(buf, *s, len))

		if (*s && len == strlen(*s) && !strncmp(buf, *s, len))

			break;

	}

	if (state < PM_SUSPEND_MAX && *s)