lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: check BUSY and ERROR status bits before reading data in drive_cmd_intr()

Browse Source 
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-01-26 20:13:12 +01:00
parent 18a056fecc
commit 4d977e43d8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/ide/ide-io.c
View File

@@ -643,8 +643,13 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
if (pio_in) { if (pio_in) {
u8 io_32bit = drive->io_32bit; u8 io_32bit = drive->io_32bit;
stat = hwif->INB(IDE_STATUS_REG); stat = hwif->INB(IDE_STATUS_REG);
if ((stat & DRQ_STAT) == 0) if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {
goto out; 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; drive->io_32bit = 0;
hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS); hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS);
drive->io_32bit = io_32bit; 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(); local_irq_enable_in_hardirq();
stat = hwif->INB(IDE_STATUS_REG); stat = hwif->INB(IDE_STATUS_REG);
} }
out:
if (!OK_STAT(stat, READY_STAT, BAD_STAT)) if (!OK_STAT(stat, READY_STAT, BAD_STAT))
return ide_error(drive, "drive_cmd", stat); return ide_error(drive, "drive_cmd", stat);
/* calls ide_end_drive_cmd */ /* calls ide_end_drive_cmd */