Home Home > GIT Browse > vanilla
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-06-13 15:19:07 +0200
committerTakashi Iwai <tiwai@suse.de>2016-06-13 15:19:07 +0200
commit2780cc41ca75d837b288798490efb2db8ed6acbf (patch)
tree2f72932d0927dbc2595a770c23f9d15753ad5da8
parent9d76c81372c855e62920c59edf08d06becad6af4 (diff)
parentaadf5085eb95421daf434925d8c1c596935a9d9d (diff)
Merge branch 'users/hare/SLE12-SP2/for-next' into SLE12-SP2rpm-4.4.13-45
Pull scsi fixes from Hannes Reinecke. suse-commit: 31b9888b0358aa10be2fafd5d334c12991bd2575
-rw-r--r--drivers/scsi/scsi.c3
-rw-r--r--drivers/scsi/scsi_devinfo.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 4543d3cc1340..00f922ea9283 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -796,6 +796,7 @@ retry_pg0:
result = scsi_vpd_inquiry(sdev, vpd_buf, 0, vpd_len);
if (result < 0) {
kfree(vpd_buf);
+ sdev->skip_vpd_pages = true;
return;
}
if (result > vpd_len) {
@@ -823,6 +824,7 @@ retry_pg80:
result = scsi_vpd_inquiry(sdev, vpd->buf, 0x80, vpd_len);
if (result < 0) {
kfree(vpd);
+ sdev->skip_vpd_pages = true;
return;
}
if (result > vpd_len) {
@@ -852,6 +854,7 @@ retry_pg83:
result = scsi_vpd_inquiry(sdev, vpd->buf, 0x83, vpd_len);
if (result < 0) {
kfree(vpd);
+ sdev->skip_vpd_pages = true;
return;
}
if (result > vpd_len) {
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index 42f05d4a160c..a416470aabba 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -209,6 +209,7 @@ static struct {
{"iRiver", "iFP Mass Driver", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
{"LASOUND", "CDX7405", "3.10", BLIST_MAX5LUN | BLIST_SINGLELUN},
{"Marvell", "Console", NULL, BLIST_SKIP_VPD_PAGES},
+ {"Marvell", "91xx Config", "1.01", BLIST_SKIP_VPD_PAGES},
{"MATSHITA", "PD-1", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
{"MATSHITA", "DMC-LC5", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},
{"MATSHITA", "DMC-LC40", NULL, BLIST_NOT_LOCKABLE | BLIST_INQUIRY_36},