diff options
| author | Linus Torvalds | 2010-04-08 16:45:36 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-04-08 16:45:36 +0200 |
| commit | cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 (patch) | |
| tree | d3e3f2067dc423721d698d154e15213aa5b0132d /drivers/ide/ide-dma.c | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff) | |
| parent | ide: Fix IDE taskfile with cfq scheduler (diff) | |
| download | kernel-qcow2-linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.tar.gz kernel-qcow2-linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.tar.xz kernel-qcow2-linux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.zip | |
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) if (rq) { hwif->rq = NULL; rq->errors = 0; + ide_requeue_and_plug(drive, rq); } return ret; } |