diff options
| author | Martin K. Petersen <martin.petersen@oracle.com> | 2013-07-30 22:58:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-14 22:57:05 -0700 |
| commit | 7eee85fd4e70561e15f1794581a9c4d641776718 (patch) | |
| tree | 7ffde59acf5f5fb44c5cbd164b47a2e784f5f350 | |
| parent | 67e6589a34ea5360b00869aaaec4a844c29cf713 (diff) | |
SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
commit 7562523e84ddc742fe1f9db8bd76b01acca89f6b upstream.
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>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/scsi/scsi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 07322ecff90d..29fabffd6993 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c @@ -1025,6 +1025,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) |