From 7ca1ef0780edcc4bdb64ba10a79235d6dd049ed6 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: 146967 b: refs/heads/master c:
 586cf2681f527ce8b85b9bd57c8b9f7945fbe051 h: refs/heads/master i:   146965:
 0a96426239b82bf2eb24dbf5834be21621a31c5c   146963:
 d6b37ca6c8ede5b81430bfd513d4a3fc5db530e0   146959:
 e1a7d4407ea6cc7de971e5393574234034f6a463 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 7be463594a94..e899e9def223 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ad960fe8d0e4f99fe2b8dded45e8251137293c9
+refs/heads/master: 586cf2681f527ce8b85b9bd57c8b9f7945fbe051
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;
 }