diff --git a/[refs] b/[refs]
index 95805454ac21..f539e5d81566 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e537a36d528053f6b9dbe6c88e763e835c0d3517
+refs/heads/master: 8e6401187ef7fb1edc2740832b48bf47ed2c90f2
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 253c1a98d159..60f07b6a5ffc 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -246,15 +246,18 @@ void scsi_wait_req(struct scsi_request *sreq, const void *cmnd, void *buffer,
 		   unsigned bufflen, int timeout, int retries)
 {
 	DECLARE_COMPLETION(wait);
+	int write = sreq->sr_data_direction == DMA_TO_DEVICE;
 	struct request *req;
 
-	if (bufflen)
-		req = blk_rq_map_kern(sreq->sr_device->request_queue,
-				      sreq->sr_data_direction == DMA_TO_DEVICE,
-				      buffer, bufflen, __GFP_WAIT);
-	else
-		req = blk_get_request(sreq->sr_device->request_queue, READ,
-				      __GFP_WAIT);
+	req = blk_get_request(sreq->sr_device->request_queue, write,
+			      __GFP_WAIT);
+	if (bufflen && blk_rq_map_kern(sreq->sr_device->request_queue, req,
+				       buffer, bufflen, __GFP_WAIT)) {
+		sreq->sr_result = DRIVER_ERROR << 24;
+		blk_put_request(req);
+		return;
+	}
+
 	req->flags |= REQ_NOMERGE;
 	req->waiting = &wait;
 	req->end_io = scsi_wait_req_end_io;