diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-09-20 23:27:08 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-09-20 23:27:08 -0400 |
| commit | a44a429581d48f5f1dc661d8484519836c219807 (patch) | |
| tree | 2d00688a5ebe9f6bb3f5ebe04fd6f35af12ac39f /kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch | |
| parent | a3b4fa51913575d1c7478abfbcdd2799d0855ab0 (diff) | |
| parent | 87b354d1fd3ad74a6d57140348bf63ddef871d11 (diff) | |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch')
| -rw-r--r-- | kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch b/kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch deleted file mode 100644 index 0415b8a1e..000000000 --- a/kernels/linux-libre-pae/3.10.6-reset-superseed-xhci-hcd.patch +++ /dev/null @@ -1,24 +0,0 @@ -[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) |