summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-atapi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-08 07:45:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-08 07:45:36 -0700
commitcf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 (patch)
treed3e3f2067dc423721d698d154e15213aa5b0132d /drivers/ide/ide-atapi.c
parent0a2851b9a837cb025d48bb8118f35ebd12bce4b5 (diff)
parent720fc22a7af79d91ec460c80efa92c65c12d105e (diff)
downloadlinux-cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30.tar.bz2
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-atapi.c')
-rw-r--r--drivers/ide/ide-atapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c
index a4046e94158d..f9daffd7d0e3 100644
--- a/drivers/ide/ide-atapi.c
+++ b/drivers/ide/ide-atapi.c
@@ -264,8 +264,8 @@ void ide_retry_pc(ide_drive_t *drive)
* of it. The failed command will be retried after sense data
* is acquired.
*/
- blk_requeue_request(failed_rq->q, failed_rq);
drive->hwif->rq = NULL;
+ ide_requeue_and_plug(drive, failed_rq);
if (ide_queue_sense_rq(drive, pc)) {
blk_start_request(failed_rq);
ide_complete_rq(drive, -EIO, blk_rq_bytes(failed_rq));