aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/scsi.c')
-rw-r--r--drivers/scsi/scsi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index b1bf42b93fcc..1deb6adc411f 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -784,8 +784,9 @@ void scsi_attach_vpd(struct scsi_device *sdev)
784 int pg83_supported = 0; 784 int pg83_supported = 0;
785 unsigned char __rcu *vpd_buf, *orig_vpd_buf = NULL; 785 unsigned char __rcu *vpd_buf, *orig_vpd_buf = NULL;
786 786
787 if (sdev->skip_vpd_pages) 787 if (!scsi_device_supports_vpd(sdev))
788 return; 788 return;
789
789retry_pg0: 790retry_pg0:
790 vpd_buf = kmalloc(vpd_len, GFP_KERNEL); 791 vpd_buf = kmalloc(vpd_len, GFP_KERNEL);
791 if (!vpd_buf) 792 if (!vpd_buf)