X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=drivers%2Fide%2Fide-io.c;fp=drivers%2Fide%2Fide-io.c;h=a0309ea661ac093c5f6cc78a8f78e781649817a7;hb=5ad960fe8d0e4f99fe2b8dded45e8251137293c9;hp=6e3094e2277528b24a1c422827b87c2b040a6c57;hpb=29d1a4371035e01b0d079bc5aa88b50f5af7a566;p=safe%2Fjmp%2Flinux-2.6

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 6e3094e..a0309ea 100644
--- a/drivers/ide/ide-io.c
+++ b/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);