diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-08-13 10:42:44 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-08-13 10:42:44 -0300 |
commit | 6af0f5b3ae8bb646b055a29e857dbd194a31930b (patch) | |
tree | 52afbe196c21407ba988f058ccfe496638f7ff1b /libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch | |
parent | ac6448ddfebb681301211fb31a022f68a4df2b96 (diff) |
linux-libre-3.10.6-2: updating version
* move new changes from libre-testing to libre
* fixed https://bugs.archlinux.org/task/35991, https://bugs.archlinux.org/task/36296
Diffstat (limited to 'libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch')
-rw-r--r-- | libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch b/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch new file mode 100644 index 000000000..0415b8a1e --- /dev/null +++ b/libre/linux-libre/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) |