diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-09 23:41:41 +0200 |
| commit | ae95d7126104591348d37aaf78c8325967e02386 (patch) | |
| tree | 3270712f030549d77d4c55246d056e02b9def29d /drivers/scsi/scsi.c | |
| parent | ipv6: fix inet6_lookup_listener() (diff) | |
| parent | Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/greg... (diff) | |
| download | linux-ae95d7126104591348d37aaf78c8325967e02386.tar.xz linux-ae95d7126104591348d37aaf78c8325967e02386.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 3 |
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) int pg83_supported = 0; unsigned char __rcu *vpd_buf, *orig_vpd_buf = NULL; - if (sdev->skip_vpd_pages) + if (!scsi_device_supports_vpd(sdev)) return; + retry_pg0: vpd_buf = kmalloc(vpd_len, GFP_KERNEL); if (!vpd_buf) |