From 5908c0a1bbdcb26a5a0ba0d3a8eb8b427c5b8f1f Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Wed, 31 Mar 2010 20:13:39 +0000 Subject: [PATCH] --- yaml --- r: 189657 b: refs/heads/master c: 1af185034662b75279f90e1c7cb958271d4121e2 h: refs/heads/master i: 189655: 1bc47963d3fadedbf09693dfc8a3999b3060458f v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-atapi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c8a44898fd14..0ebc9f253b45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6072f7491f5ef391a575e18a1165e72a3eef1601 +refs/heads/master: 1af185034662b75279f90e1c7cb958271d4121e2 diff --git a/trunk/drivers/ide/ide-atapi.c b/trunk/drivers/ide/ide-atapi.c index eb2181a6a11c..9aedb9aa544f 100644 --- a/trunk/drivers/ide/ide-atapi.c +++ b/trunk/drivers/ide/ide-atapi.c @@ -263,8 +263,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));