summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2010-03-29 09:29:24 +0200
committerJames Bottomley <James.Bottomley@suse.de>2010-04-11 13:25:06 -0500
commitf87146bba523cad0196aa8e80ca9e8243d7a6c0c (patch)
tree87cc2f1a1dd4cc1771baab020d68bcb0a32de688 /drivers/scsi/sd.c
parent457549da730ec43bdc594ec7b475464b9d52a15f (diff)
downloadop-kernel-dev-f87146bba523cad0196aa8e80ca9e8243d7a6c0c.zip
op-kernel-dev-f87146bba523cad0196aa8e80ca9e8243d7a6c0c.tar.gz
[SCSI] sd: quiet spurious error messages in READ_CAPACITY(16)
sd always tries to submit a READ_CAPACITY(16) CDB, regardless whether the host actually supports it. queuecommand() will then return DID_ABORT, which is not qualified enough to detect the true cause here. So better check in sd_try_rc16 first if the cdblen is supported. Signed-off-by: Hannes Reinecke <hare@suse.de> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 58c62ff..7955bc2 100644
--- a/drivers/scsi/sd.c
+++ b/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))
OpenPOWER on IntegriCloud