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

Commit 3efa147a authored Jul 07, 2005 by Pavel Machek Committed by Linus Torvalds Jul 07, 2005

[PATCH] pm: Fix resume from initrd



Move device name resolution code around so that it is not called from
resume-from-initrd.  name_to_dev_t may be unavailable at that point.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent e00d9967

kernel/power/disk.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -234,6 +234,16 @@ static int software_resume(void)
		{
		int error;

		if (!swsusp_resume_device) {
		if (!strlen(resume_file))
		return -ENOENT;
		swsusp_resume_device = name_to_dev_t(resume_file);
		pr_debug("swsusp: Resume From Partition %s\n", resume_file);
		} else {
		pr_debug("swsusp: Resume From Partition %d:%d\n",
		MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device));
		}

		if (noresume) {
		/**
		* FIXME: If noresume is specified, we need to find the partition

kernel/power/swsusp.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -1356,16 +1356,6 @@ int swsusp_check(void)
		{
		int error;

		if (!swsusp_resume_device) {
		if (!strlen(resume_file))
		return -ENOENT;
		swsusp_resume_device = name_to_dev_t(resume_file);
		pr_debug("swsusp: Resume From Partition %s\n", resume_file);
		} else {
		pr_debug("swsusp: Resume From Partition %d:%d\n",
		MAJOR(swsusp_resume_device), MINOR(swsusp_resume_device));
		}

		resume_bdev = open_by_devnum(swsusp_resume_device, FMODE_READ);
		if (!IS_ERR(resume_bdev)) {
		set_blocksize(resume_bdev, PAGE_SIZE);