diff options
| author |   Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:12 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:12 +0100 |
| commit | 0455fcc821e87d362f2047922c59c0f378a122b5 (patch) | |
| tree | 34e50ace5cbe95378234c859032a3f47e4a7b183 /drivers | |
| parent | ide: check BUSY and ERROR status bits before reading data in drive_cmd_intr() (diff) | |
| download | linux-dev-0455fcc821e87d362f2047922c59c0f378a122b5.tar.xz linux-dev-0455fcc821e87d362f2047922c59c0f378a122b5.zip | |
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 <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ide/ide-io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index ce8ab1085936..cad057d25a29 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; |