Merge commit 'v2.6.28-rc4' into timers/rtc

Conflicts:
	drivers/rtc/rtc-cmos.c

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index 331f9836383f..c9d74083746f 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -651,7 +651,7 @@ static int software_resume(void)
         pr_debug("PM: Preparing processes for restore.\n");
         error = prepare_processes();
         if (error) {
-                swsusp_close();
+                swsusp_close(FMODE_READ);
                 goto Done;
         }