diff --git a/[refs] b/[refs]
index 738fef09cd78..6d36f9da9325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf2b3de2a8e66e5f554c2113fac688bcaaca77fb
+refs/heads/master: 616e8a091a035c0bd9b871695f4af191df123caa
diff --git a/trunk/block/scsi_ioctl.c b/trunk/block/scsi_ioctl.c
index 2dc326421a24..a19338e6215d 100644
--- a/trunk/block/scsi_ioctl.c
+++ b/trunk/block/scsi_ioctl.c
@@ -246,10 +246,10 @@ static int sg_io(struct file *file, request_queue_t *q,
 		switch (hdr->dxfer_direction) {
 		default:
 			return -EINVAL;
-		case SG_DXFER_TO_FROM_DEV:
 		case SG_DXFER_TO_DEV:
 			writing = 1;
 			break;
+		case SG_DXFER_TO_FROM_DEV:
 		case SG_DXFER_FROM_DEV:
 			break;
 		}