Skip to contentSkip to conversation

ide: fix final status check in drive_cmd_intr()

PATCH In review Bartlomiej Zolnierkiewicz 2 participants 2 messages Dec 9, 2007 – Dec 10, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 17/20 ide: fix final status check in drive_cmd_intr()

Don't check for READY_STAT bit being set for PIO-in protocol (makes the final status check in drive_cmd_intr() match the one in task_in_intr()).

Also fix function name reported by ide_error() call while at it.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
---
 drivers/ide/ide-io.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ide/ide-io.c +2 -2
Index: b/drivers/ide/ide-io.c
===================================================================
@@ -659,8 +659,8 @@ static ide_startstop_t drive_cmd_intr (i
 		stat = hwif->INB(IDE_STATUS_REG);
 	}
 
-	if (!OK_STAT(stat, READY_STAT, BAD_STAT))
-		return ide_error(drive, "drive_cmd", stat);
+	if (!OK_STAT(stat, (pio_in ? 0 : READY_STAT), BAD_STAT))
+		return ide_error(drive, __FUNCTION__, stat);
 		/* calls ide_end_drive_cmd */
 	ide_end_drive_cmd(drive, stat, hwif->INB(IDE_ERROR_REG));
 	return ide_stopped;