From: Kacper Kornet <draenog@pld-linux.org>
Date: Tue, 6 Aug 2013 21:06:32 +0000 (+0100)
Subject: - fix discovering of some USB drives
X-Git-Tag: auto/th/kernel-3.10.9-1~6
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=20e3bfd4d15776ca1b6a385469b42c076ae31331;p=packages%2Fkernel.git

- fix discovering of some USB drives
---

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 392d1212..2b0f82db 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -46,3 +46,27 @@ index 7a0c800..ec5ebbb 100644
  	SET_ETHTOOL_OPS(dev, &rtl8169_ethtool_ops);
  	dev->watchdog_timeo = RTL8169_TX_TIMEOUT;
  
+[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 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)