From 6af78a31e74e92a0071ee6131db3e2877d07a0f3 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 21 Apr 2009 12:16:56 +0900
Subject: [PATCH] --- yaml --- r: 146349 b: refs/heads/master c:
 2ecf0a57c60dcb588f310d94412118e15c510532 h: refs/heads/master i:   146347:
 0cd9b9af7d892a735e2eef2f25a1588986fd0c80 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/ide/ide-dma.c | 20 ++++----------------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index cd1d4651c9af..029ae42f77ec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69
+refs/heads/master: 2ecf0a57c60dcb588f310d94412118e15c510532
diff --git a/trunk/drivers/ide/ide-dma.c b/trunk/drivers/ide/ide-dma.c
index a0b8cab1d9a6..d9123ecae4a9 100644
--- a/trunk/drivers/ide/ide-dma.c
+++ b/trunk/drivers/ide/ide-dma.c
@@ -510,23 +510,11 @@ ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
 	/*
 	 * un-busy drive etc and make sure request is sane
 	 */
-
 	rq = hwif->rq;
-	if (!rq)
-		goto out;
-
-	hwif->rq = NULL;
-
-	rq->errors = 0;
-
-	if (!rq->bio)
-		goto out;
-
-	rq->sector = rq->bio->bi_sector;
-	rq->current_nr_sectors = bio_iovec(rq->bio)->bv_len >> 9;
-	rq->hard_cur_sectors = rq->current_nr_sectors;
-	rq->buffer = bio_data(rq->bio);
-out:
+	if (rq) {
+		hwif->rq = NULL;
+		rq->errors = 0;
+	}
 	return ret;
 }