diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-15 11:35:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-04-15 11:35:46 +1000 |
| commit | c3c685949954f271be9e2f3d0fe0e771a4cdfa2d (patch) | |
| tree | 26bfa10543964363f1a1a7e14e957d1502e85ae3 | |
| parent | 04b62a848a663ed98847bfc971faaa1f8f1ea3ba (diff) | |
| parent | c48b24ba6db637e92f477ac2646be21e12b29f86 (diff) | |
Merge remote branch 'ide/master'
| -rw-r--r-- | drivers/ide/ide-dma.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 06b14bc9a1d4..d4136908f916 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c @@ -449,7 +449,6 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) ide_hwif_t *hwif = drive->hwif; const struct ide_dma_ops *dma_ops = hwif->dma_ops; struct ide_cmd *cmd = &hwif->cmd; - struct request *rq; ide_startstop_t ret = ide_stopped; /* @@ -487,14 +486,10 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) ide_dma_off_quietly(drive); /* - * un-busy drive etc and make sure request is sane + * make sure request is sane */ - rq = hwif->rq; - if (rq) { - hwif->rq = NULL; - rq->errors = 0; - ide_requeue_and_plug(drive, rq); - } + if (hwif->rq) + hwif->rq->errors = 0; return ret; } |