34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
From: "Martin K. Petersen" <martin.petersen@oracle.com>
|
|
Date: Tue, 30 Jul 2013 22:58:34 -0400
|
|
Subject: [SCSI] Don't attempt to send extended INQUIRY command if
|
|
skip_vpd_pages is set
|
|
Origin: https://git.kernel.org/cgit/linux/kernel/git/jejb/scsi.git/commit?id=7562523e84ddc742fe1f9db8bd76b01acca89f6b
|
|
Bug-Debian: http://bugs.debian.org/719002
|
|
|
|
If a device has the skip_vpd_pages flag set we should simply fail the
|
|
scsi_get_vpd_page() call.
|
|
|
|
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
Acked-by: Alan Stern <stern@rowland.harvard.edu>
|
|
Tested-by: Stuart Foster <smf.linux@ntlworld.com>
|
|
Cc: stable@vger.kernel.org
|
|
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
|
|
---
|
|
drivers/scsi/scsi.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
|
|
index 3b1ea34..eaa808e 100644
|
|
--- a/drivers/scsi/scsi.c
|
|
+++ b/drivers/scsi/scsi.c
|
|
@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
|
|
{
|
|
int i, result;
|
|
|
|
+ if (sdev->skip_vpd_pages)
|
|
+ goto fail;
|
|
+
|
|
/* Ask for all the pages supported by this device */
|
|
result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
|
|
if (result)
|