---

yaml --- r: 146967 b: refs/heads/master c: 586cf26 h: refs/heads/master i: 146965: 0a96426 146963: d6b37ca 146959: e1a7d44 v: v3
git-mirror · Apr 28, 2009 · 7ca1ef0 · 7ca1ef0
1 parent 109eedc
commit 7ca1ef0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 17 deletions.
diff --git 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
@@ -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;
 }