diff options
-rw-r--r-- | drivers/ide/ide-taskfile.c | 4 | ||||
-rw-r--r-- | include/linux/ide.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c index 17c2c0467297..c34836c02b14 100644 --- a/drivers/ide/ide-taskfile.c +++ b/drivers/ide/ide-taskfile.c | |||
@@ -436,7 +436,7 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive) | |||
436 | u8 stat = hwif->INB(IDE_STATUS_REG); | 436 | u8 stat = hwif->INB(IDE_STATUS_REG); |
437 | 437 | ||
438 | /* new way for dealing with premature shared PCI interrupts */ | 438 | /* new way for dealing with premature shared PCI interrupts */ |
439 | if (!OK_STAT(stat, DATA_READY, BAD_R_STAT)) { | 439 | if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) { |
440 | if (stat & (ERR_STAT | DRQ_STAT)) | 440 | if (stat & (ERR_STAT | DRQ_STAT)) |
441 | return task_error(drive, rq, __FUNCTION__, stat); | 441 | return task_error(drive, rq, __FUNCTION__, stat); |
442 | /* No data yet, so wait for another IRQ. */ | 442 | /* No data yet, so wait for another IRQ. */ |
@@ -493,7 +493,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, struct request *rq) | |||
493 | { | 493 | { |
494 | ide_startstop_t startstop; | 494 | ide_startstop_t startstop; |
495 | 495 | ||
496 | if (ide_wait_stat(&startstop, drive, DATA_READY, | 496 | if (ide_wait_stat(&startstop, drive, DRQ_STAT, |
497 | drive->bad_wstat, WAIT_DRQ)) { | 497 | drive->bad_wstat, WAIT_DRQ)) { |
498 | printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n", | 498 | printk(KERN_ERR "%s: no DRQ after issuing %sWRITE%s\n", |
499 | drive->name, | 499 | drive->name, |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 6192564fcc5a..7615a6244a51 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -107,7 +107,6 @@ typedef unsigned char byte; /* used everywhere */ | |||
107 | #define BAD_W_STAT (BAD_R_STAT | WRERR_STAT) | 107 | #define BAD_W_STAT (BAD_R_STAT | WRERR_STAT) |
108 | #define BAD_STAT (BAD_R_STAT | DRQ_STAT) | 108 | #define BAD_STAT (BAD_R_STAT | DRQ_STAT) |
109 | #define DRIVE_READY (READY_STAT | SEEK_STAT) | 109 | #define DRIVE_READY (READY_STAT | SEEK_STAT) |
110 | #define DATA_READY (DRQ_STAT) | ||
111 | 110 | ||
112 | #define BAD_CRC (ABRT_ERR | ICRC_ERR) | 111 | #define BAD_CRC (ABRT_ERR | ICRC_ERR) |
113 | 112 | ||