summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 20:13:12 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 20:13:12 +0100
commit4d977e43d8ae758434e603cf2455d955f71c77c4 (patch)
treeef8f0922ba6e75d270d111dc78b3644321cb6c11 /drivers/ide
parent18a056feccabdfa9764016a615121b194828bc72 (diff)
downloadop-kernel-dev-4d977e43d8ae758434e603cf2455d955f71c77c4.zip
op-kernel-dev-4d977e43d8ae758434e603cf2455d955f71c77c4.tar.gz
ide: check BUSY and ERROR status bits before reading data in drive_cmd_intr()
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-io.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index dc6af24..ce8ab10 100644
--- a/drivers/ide/ide-io.c
+++ b/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 */
OpenPOWER on IntegriCloud