swsusp: platform notifications not properly undone in case of error

swsusp: platform notifications not properly undone in case of error

[Pavel Machek]

Hi!


Using IPI No-Shortcut mode
swsusp: Resume From Partition /dev/sda1
PM: Checking swsusp image.
swsusp: Signature found, resuming
PM: Preparing processes for restore.
Stopping tasks ... done.
PM: Reading swsusp image.
Loading image data pages (125285 pages) ...     <3>swsusp: Resume
mismatch: version
Read 501140 kbytes in 0.01 seconds (50114.00 MB/s)
swsusp: Error -1 resuming
PM: Restore failed, recovering.
Restarting tasks ... done.
PM: Resume from disk failed.
md: Autodetecting RAID arrays.

...and machine boots, but moon icon keeps blinking.
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: swsusp: platform notifications not properly undone in case of error

[Rafael J. Wysocki]

On Thursday, 8 March 2007 17:41, Pavel Machek wrote:
> Hi!
> 
> 
> Using IPI No-Shortcut mode
> swsusp: Resume From Partition /dev/sda1
> PM: Checking swsusp image.
> swsusp: Signature found, resuming
> PM: Preparing processes for restore.
> Stopping tasks ... done.
> PM: Reading swsusp image.
> Loading image data pages (125285 pages) ...     <3>swsusp: Resume
> mismatch: version
> Read 501140 kbytes in 0.01 seconds (50114.00 MB/s)
> swsusp: Error -1 resuming
> PM: Restore failed, recovering.
> Restarting tasks ... done.
> PM: Resume from disk failed.
> md: Autodetecting RAID arrays.
> 
> ...and machine boots, but moon icon keeps blinking.

Does the appended patch help?

Rafael

---
 kernel/power/disk.c |    1 +
 1 file changed, 1 insertion(+)

Index: linux-2.6.21-rc3/kernel/power/disk.c
===================================================================
--- linux-2.6.21-rc3.orig/kernel/power/disk.c
+++ linux-2.6.21-rc3/kernel/power/disk.c
@@ -261,6 +261,7 @@ static int software_resume(void)
 	error = swsusp_read();
 	if (error) {
 		swsusp_free();
+		platform_finish();
 		goto Thaw;
 	}