diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-03 18:32:33 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2015-12-03 18:32:33 +0100 |
| commit | be9e2f775f5a3147205c552534c3abf0f9374a13 (patch) | |
| tree | 9c10584796d73f80295d9c238a089f12621db316 /drivers/scsi/scsi_scan.c | |
| parent | Revert "scsi: Fix a bdi reregistration race" (diff) | |
| parent | mpt3sas: fix Kconfig dependency problem for mpt2sas back compatibility (diff) | |
| download | linux-be9e2f775f5a3147205c552534c3abf0f9374a13.tar.xz linux-be9e2f775f5a3147205c552534c3abf0f9374a13.zip | |
Merge branch 'mkp-fixes' into fixes
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 83245391e956..054923e3393c 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -701,9 +701,12 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, * strings. */ if (sdev->inquiry_len < 36) { - sdev_printk(KERN_INFO, sdev, - "scsi scan: INQUIRY result too short (%d)," - " using 36\n", sdev->inquiry_len); + if (!sdev->host->short_inquiry) { + shost_printk(KERN_INFO, sdev->host, + "scsi scan: INQUIRY result too short (%d)," + " using 36\n", sdev->inquiry_len); + sdev->host->short_inquiry = 1; + } sdev->inquiry_len = 36; } |