From: Bartlomiej Zolnierkiewicz Date: Sat, 26 Jan 2008 19:13:12 +0000 (+0100) Subject: ide: fix final status check in drive_cmd_intr() X-Git-Tag: v2.6.25-rc1~1227^2~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0455fcc821e87d362f2047922c59c0f378a122b5;p=linux-2.6 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. Acked-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz --- diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index ce8ab10859..cad057d25a 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -659,8 +659,8 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive) 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;