diff --git a/[refs] b/[refs]
index ddf37ae8a705..675b3fc64934 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a3c5e4a672c5cd61cbdcedcd027312577f9ab7c
+refs/heads/master: fecae40abb1ae9218bdbaa8b8e30bfb5ae43f522
diff --git a/trunk/drivers/target/target_core_spc.c b/trunk/drivers/target/target_core_spc.c
index 33022a3f31fc..f9c2bd02043c 100644
--- a/trunk/drivers/target/target_core_spc.c
+++ b/trunk/drivers/target/target_core_spc.c
@@ -870,8 +870,11 @@ static int spc_emulate_modesense(struct se_cmd *cmd)
 	} else {
 		buf = map_buf;
 	}
-
-	length = ten ? 2 : 1;
+	/*
+	 * Skip over MODE DATA LENGTH + MEDIUM TYPE fields to byte 3 for
+	 * MODE_SENSE_10 and byte 2 for MODE_SENSE (6).
+	 */
+	length = ten ? 3 : 2;
 
 	/* DEVICE-SPECIFIC PARAMETER */
 	if ((cmd->se_lun->lun_access & TRANSPORT_LUNFLAGS_READ_ONLY) ||