From 5a7a4eb2df543706a5efa388bfad1599677149c0 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 26 Jan 2008 20:13:12 +0100 Subject: [PATCH] --- yaml --- r: 77287 b: refs/heads/master c: 0455fcc821e87d362f2047922c59c0f378a122b5 h: refs/heads/master i: 77285: ce40754c2d01a390116a4bbe8640991cd43867d7 77283: edcf0df5aa058222291c968d3fde6092ac1bcd26 77279: 73dd5ce007ba8d0cf239f6f54b969c8c589a5cbd v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-io.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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;