---

yaml --- r: 146966 b: refs/heads/master c: 5ad960f h: refs/heads/master v: v3
git-mirror · Apr 28, 2009 · 109eedc · 109eedc
1 parent 0a96426
commit 109eedc
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: 29d1a4371035e01b0d079bc5aa88b50f5af7a566
+refs/heads/master: 5ad960fe8d0e4f99fe2b8dded45e8251137293c9
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);