IDE suspend small fixes
Hi!
Its bad idea to try to restore state twice for one suspend, this fixes it. Please apply,
Pavel
drivers/ide/ide-disk.c +7 -1
@@ -123,7 +123,7 @@while (drive->blocked) {yield (); -// panic("ide: Request while drive blocked?"); +printk ("ide: Request while drive blocked?" ); }if (!(rq->flags &REQ_CMD )) {
@@ -915,6 +915,9 @@* already been done... */ +if (level !=SUSPEND_SAVE_STATE ) +return 0 ; +/* wait until all commands are finished */ printk ("ide_disk_suspend()\n" );while (HWGROUP (drive)->handler)
@@ -934,6 +937,9 @@static int idedisk_resume (struct device *dev,u32 level) {ide_drive_t *drive = dev->driver_data; + +if (level !=RESUME_RESTORE_STATE ) +return 0 ;if (!drive->blocked)panic ("ide: Resume but not suspended?\n" );
Signature · 2 lines
(about SSSCA) "I don't say this lightly. However, I really think that the U.S. no longer is classifiable as a democracy, but rather as a plutocracy." --hpa