diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 10:45:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 10:45:36 -0400 |
| commit | cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 (patch) | |
| tree | d3e3f2067dc423721d698d154e15213aa5b0132d /drivers/ide/ide-dma.c | |
| parent | 0a2851b9a837cb025d48bb8118f35ebd12bce4b5 (diff) | |
| parent | 720fc22a7af79d91ec460c80efa92c65c12d105e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: Fix IDE taskfile with cfq scheduler
ide: Must hold queue lock when requeueing
ide: Requeue request after DMA timeout
Diffstat (limited to 'drivers/ide/ide-dma.c')
| -rw-r--r-- | drivers/ide/ide-dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 2c17e3fb43e3..06b14bc9a1d4 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -493,6 +493,7 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error) | |||
| 493 | if (rq) { | 493 | if (rq) { |
| 494 | hwif->rq = NULL; | 494 | hwif->rq = NULL; |
| 495 | rq->errors = 0; | 495 | rq->errors = 0; |
| 496 | ide_requeue_and_plug(drive, rq); | ||
| 496 | } | 497 | } |
| 497 | return ret; | 498 | return ret; |
| 498 | } | 499 | } |