summaryrefslogtreecommitdiffstats
path: root/include/scsi
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2016-04-01 08:57:37 +0200
committerMartin K. Petersen <martin.petersen@oracle.com>2016-04-15 16:53:08 -0400
commite4c36ad756ec2de36b05c66bb50ed4ff47b0fdb0 (patch)
tree6d69f4260b6a039191cf3242f56cd809f8eca808 /include/scsi
parent305c2e71b3d733ec065cb716c76af7d554bd5571 (diff)
downloadlinux-stable-e4c36ad756ec2de36b05c66bb50ed4ff47b0fdb0.tar.gz
linux-stable-e4c36ad756ec2de36b05c66bb50ed4ff47b0fdb0.tar.bz2
linux-stable-e4c36ad756ec2de36b05c66bb50ed4ff47b0fdb0.zip
scsi: vpd pages are mandatory for SPC-2
VPD pages 0x0 and 0x83 are mandatory even for SPC-2, so we should be lowering the restriction to avoid having to whitelist every SPC-2 compliant device. Signed-off-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'include/scsi')
-rw-r--r--include/scsi/scsi_device.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 7d85de855160..a6c346df290d 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -542,9 +542,9 @@ static inline int scsi_device_supports_vpd(struct scsi_device *sdev)
/*
* Although VPD inquiries can go to SCSI-2 type devices,
* some USB ones crash on receiving them, and the pages
- * we currently ask for are for SPC-3 and beyond
+ * we currently ask for are mandatory for SPC-2 and beyond
*/
- if (sdev->scsi_level > SCSI_SPC_2 && !sdev->skip_vpd_pages)
+ if (sdev->scsi_level >= SCSI_SPC_2 && !sdev->skip_vpd_pages)
return 1;
return 0;
}