diff --git a/[refs] b/[refs]
index 1fb34f22ef2e..601e0ab20b1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 457549da730ec43bdc594ec7b475464b9d52a15f
+refs/heads/master: f87146bba523cad0196aa8e80ca9e8243d7a6c0c
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
index 58c62ff42ab3..7955bc226125 100644
--- a/trunk/drivers/scsi/sd.c
+++ b/trunk/drivers/scsi/sd.c
@@ -1573,6 +1573,8 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
 
 static int sd_try_rc16_first(struct scsi_device *sdp)
 {
+	if (sdp->host->max_cmd_len < 16)
+		return 0;
 	if (sdp->scsi_level > SCSI_SPC_2)
 		return 1;
 	if (scsi_device_protection(sdp))