From 42c28827f5a1ed90e5e8158c2bbd8f4e832a9959 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 26 Jan 2008 20:13:12 +0100 Subject: [PATCH] --- yaml --- r: 77286 b: refs/heads/master c: 4d977e43d8ae758434e603cf2455d955f71c77c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-io.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 922efc16b375..a4e5557f57eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18a056feccabdfa9764016a615121b194828bc72 +refs/heads/master: 4d977e43d8ae758434e603cf2455d955f71c77c4 diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c index dc6af24a97d9..ce8ab1085936 100644 --- a/trunk/drivers/ide/ide-io.c +++ b/trunk/drivers/ide/ide-io.c @@ -643,8 +643,13 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive) if (pio_in) { u8 io_32bit = drive->io_32bit; stat = hwif->INB(IDE_STATUS_REG); - if ((stat & DRQ_STAT) == 0) - goto out; + if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) { + if (stat & (ERR_STAT | DRQ_STAT)) + return ide_error(drive, __FUNCTION__, stat); + ide_set_handler(drive, &drive_cmd_intr, WAIT_WORSTCASE, + NULL); + return ide_started; + } drive->io_32bit = 0; hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS); drive->io_32bit = io_32bit; @@ -653,7 +658,7 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive) local_irq_enable_in_hardirq(); stat = hwif->INB(IDE_STATUS_REG); } -out: + if (!OK_STAT(stat, READY_STAT, BAD_STAT)) return ide_error(drive, "drive_cmd", stat); /* calls ide_end_drive_cmd */