---

yaml --- r: 146348 b: refs/heads/master c: 2c316bb h: refs/heads/master v: v3
git-mirror · Apr 18, 2009 · 79862fe · 79862fe
1 parent 0cd9b9a
commit 79862fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7003877c2f0578f1c08f66d05c3f72ef4ae596
+refs/heads/master: 2c316bb57ad4e9f0f3de2d7ef1ae85530c2a7e69
diff --git a/trunk/drivers/ide/ide-io.c b/trunk/drivers/ide/ide-io.c
@@ -248,11 +248,7 @@ void ide_map_sg(ide_drive_t *drive, struct ide_cmd *cmd)
 	struct scatterlist *sg = hwif->sg_table;
 	struct request *rq = cmd->rq;
 
-	if (!rq->bio) {
-		sg_init_one(sg, rq->data, rq->data_len);
-		cmd->sg_nents = 1;
-	} else
-		cmd->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
+	cmd->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);
 }
 EXPORT_SYMBOL_GPL(ide_map_sg);