diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /drivers/ide/ide-dma.c | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/ide-dma.c')
| -rw-r--r-- | drivers/ide/ide-dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 3cf59f2c3928..a4bb32883c6b 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -147,7 +147,8 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive) | |||
| 147 | u8 stat = 0, dma_stat = 0; | 147 | u8 stat = 0, dma_stat = 0; |
| 148 | 148 | ||
| 149 | dma_stat = HWIF(drive)->ide_dma_end(drive); | 149 | dma_stat = HWIF(drive)->ide_dma_end(drive); |
| 150 | stat = HWIF(drive)->INB(IDE_STATUS_REG); /* get drive status */ | 150 | stat = ide_read_status(drive); |
| 151 | |||
| 151 | if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) { | 152 | if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) { |
| 152 | if (!dma_stat) { | 153 | if (!dma_stat) { |
| 153 | struct request *rq = HWGROUP(drive)->rq; | 154 | struct request *rq = HWGROUP(drive)->rq; |