---

yaml --- r: 195617 b: refs/heads/master c: f87146b h: refs/heads/master i: 195615: 1c55d9f v: v3
git-mirror · Apr 11, 2010 · ca7d5ba · ca7d5ba
1 parent 41932d1
commit ca7d5ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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))