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

Commit 421a5fa1 authored by Sebastian Capella's avatar Sebastian Capella Committed by Rafael J. Wysocki
Browse files

PM / hibernate: use name_to_dev_t to parse resume 



Use the name_to_dev_t call to parse the device name echo'd to
to /sys/power/resume.  This imitates the method used in hibernate.c
in software_resume, and allows the resume partition to be specified
using other equivalent device formats as well.  By allowing
/sys/debug/resume to accept the same syntax as the resume=device
parameter, we can parse the resume=device in the init script and
use the resume device directly from the kernel command line.

Signed-off-by: default avatarSebastian Capella <sebastian.capella@linaro.org>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6c5be291

kernel/power/hibernate.c

+12 −10
Original line number Diff line number Diff line
@@ -973,16 +973,20 @@ static ssize_t resume_show(struct kobject *kobj, struct kobj_attribute *attr, 
static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr,

			    const char *buf, size_t n)

{

	unsigned int maj, min;

	dev_t res;

	int ret = -EINVAL;



	if (sscanf(buf, "%u:%u", &maj, &min) != 2)

		goto out;



	res = MKDEV(maj,min);

	if (maj != MAJOR(res) || min != MINOR(res))

		goto out;

	int len = n;

	char *name;



	if (len && buf[len-1] == '\n')

		len--;

	name = kstrndup(buf, len, GFP_KERNEL);

	if (!name)

		return -ENOMEM;



	res = name_to_dev_t(name);

	kfree(name);

	if (!res)

		return -EINVAL;



	lock_system_sleep();

	swsusp_resume_device = res;
@@ -990,9 +994,7 @@ static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr, 
	printk(KERN_INFO "PM: Starting manual resume from disk\n");

	noresume = 0;

	software_resume();

	ret = n;

 out:

	return ret;

	return n;

}



power_attr(resume);