diff options
| author | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
|---|---|---|
| committer | aurelien <aurelien@cwb.io> | 2013-09-23 10:33:22 +0200 |
| commit | 2735c9d273c54b555681f30f5c685998fed7b484 (patch) | |
| tree | f8172dbea44d1c4751a99a62fb236a14c9d2dc20 /kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch | |
| parent | d78a32a6ccb8663a62a093b54e947e2efc840fe0 (diff) | |
| parent | 97f65e06566f3bb15bc7395624017b8e6ca0d043 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch')
| -rw-r--r-- | kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch b/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch new file mode 100644 index 000000000..0415b8a1e --- /dev/null +++ b/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch @@ -0,0 +1,24 @@ +[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set + +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 + +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) |