Skip to contentSkip to conversation

ide: fix PIO setup on resume for ATAPI devices

PATCH In review Bartlomiej Zolnierkiewicz 1 participant 1 message Mar 10, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 1/13 ide: fix PIO setup on resume for ATAPI devices

[PATCH] ide: fix PIO setup on resume for ATAPI devices

PIO should be restored also for ATAPI devices during resume, fix it.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---

 drivers/ide/ide-io.c |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
drivers/ide/ide-io.c +7 -10
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -172,15 +172,6 @@ static ide_startstop_t ide_start_power_s
 
 	memset(args, 0, sizeof(*args));
 
-	if (drive->media != ide_disk) {
-		/*
-		 * skip idedisk_pm_restore_pio and idedisk_pm_idle for ATAPI
-		 * devices
-		 */
-		if (pm->pm_step == idedisk_pm_restore_pio)
-			pm->pm_step = ide_pm_restore_dma;
-	}
-
 	switch (pm->pm_step) {
 	case ide_pm_flush_cache:	/* Suspend step 1 (flush cache) */
 		if (drive->media != ide_disk)

@@ -207,7 +198,13 @@ static ide_startstop_t ide_start_power_s
 	case idedisk_pm_restore_pio:	/* Resume step 1 (restore PIO) */
 		if (drive->hwif->tuneproc != NULL)
 			drive->hwif->tuneproc(drive, 255);
-		ide_complete_power_step(drive, rq, 0, 0);
+		/*
+		 * skip idedisk_pm_idle for ATAPI devices
+		 */
+		if (drive->media != ide_disk)
+			pm->pm_step = ide_pm_restore_dma;
+		else
+			ide_complete_power_step(drive, rq, 0, 0);
 		return ide_stopped;
 
 	case idedisk_pm_idle:		/* Resume step 2 (idle) */