From 98196e3cc50feb54062b73437aacae5c1dc05337 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Sat, 3 Sep 2005 15:57:04 -0700
Subject: [PATCH] --- yaml --- r: 7003 b: refs/heads/master c:
 dd5d666b7995e542b7f81a4bb1c7ad634f4f6c51 h: refs/heads/master i:   7001:
 11d010c6805cc2a4a9211d71509d6502b5976f6e   6999:
 f37101b009126229dded3e123e2c3bb17c9091e1 v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/power/disk.c | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e2069abf6756..0c50ead9e862 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ed9fcec85d5ef0e34ea18affe95e4a246714565
+refs/heads/master: dd5d666b7995e542b7f81a4bb1c7ad634f4f6c51
diff --git a/trunk/kernel/power/disk.c b/trunk/kernel/power/disk.c
index 664eb0469b6e..88beec6dcd11 100644
--- a/trunk/kernel/power/disk.c
+++ b/trunk/kernel/power/disk.c
@@ -233,9 +233,12 @@ static int software_resume(void)
 {
 	int error;
 
+	down(&pm_sem);
 	if (!swsusp_resume_device) {
-		if (!strlen(resume_file))
+		if (!strlen(resume_file)) {
+			up(&pm_sem);
 			return -ENOENT;
+		}
 		swsusp_resume_device = name_to_dev_t(resume_file);
 		pr_debug("swsusp: Resume From Partition %s\n", resume_file);
 	} else {
@@ -248,6 +251,7 @@ static int software_resume(void)
 		 * FIXME: If noresume is specified, we need to find the partition
 		 * and reset it back to normal swap space.
 		 */
+		up(&pm_sem);
 		return 0;
 	}
 
@@ -284,6 +288,8 @@ static int software_resume(void)
  Cleanup:
 	unprepare_processes();
  Done:
+	/* For success case, the suspend path will release the lock */
+	up(&pm_sem);
 	pr_debug("PM: Resume from disk failed.\n");
 	return 0;
 }
@@ -390,7 +396,9 @@ static ssize_t resume_store(struct subsystem * subsys, const char * buf, size_t
 	if (sscanf(buf, "%u:%u", &maj, &min) == 2) {
 		res = MKDEV(maj,min);
 		if (maj == MAJOR(res) && min == MINOR(res)) {
+			down(&pm_sem);
 			swsusp_resume_device = res;
+			up(&pm_sem);
 			printk("Attempting manual resume\n");
 			noresume = 0;
 			software_resume();