diff --git a/[refs] b/[refs]
index 41bae4feedcd..85ff05ee7c44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1970baf6d74e03bd32072ab453f2fc01bc1b8d3
+refs/heads/master: e1f546e185e9d8cb9303d74d1cd5bc704f265384
diff --git a/trunk/drivers/block/scsi_ioctl.c b/trunk/drivers/block/scsi_ioctl.c
index 09a7e73a0812..b35cb75c7528 100644
--- a/trunk/drivers/block/scsi_ioctl.c
+++ b/trunk/drivers/block/scsi_ioctl.c
@@ -216,7 +216,7 @@ static int sg_io(struct file *file, request_queue_t *q,
 		struct gendisk *bd_disk, struct sg_io_hdr *hdr)
 {
 	unsigned long start_time;
-	int reading, writing, ret;
+	int reading, writing, ret = 0;
 	struct request *rq;
 	struct bio *bio;
 	char sense[SCSI_SENSE_BUFFERSIZE];
@@ -249,7 +249,6 @@ static int sg_io(struct file *file, request_queue_t *q,
 			reading = 1;
 			break;
 		}
-	}
 
 	rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
 	if (!rq)
@@ -335,7 +334,7 @@ static int sg_io(struct file *file, request_queue_t *q,
 			hdr->sb_len_wr = len;
 	}
 
-	if (blk_rq_unmap_user(rq, bio, hdr->dxfer_len))
+	if (blk_rq_unmap_user(bio, hdr->dxfer_len))
 		ret = -EFAULT;
 
 	/* may not have succeeded, but output values written to control