diff --git a/[refs] b/[refs] index a4e5557f57eb..0628517b41ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d977e43d8ae758434e603cf2455d955f71c77c4 +refs/heads/master: 0455fcc821e87d362f2047922c59c0f378a122b5 diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c index ce8ab1085936..cad057d25a29 100644 --- a/trunk/drivers/ide/ide-io.c +++ b/trunk/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;