linux3.10: added a patch from linux-usb@ for some USB disks resulting in ETIMEDOUT.

This commit is contained in:
Juan RP 2013-08-09 09:11:03 +02:00
parent be701a8ce0
commit 5d1dedd29c
2 changed files with 25 additions and 1 deletions

View file

@ -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
--- drivers/scsi/scsi.c
+++ 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)

View file

@ -2,7 +2,7 @@
#
pkgname=linux3.10
version=3.10.5
revision=1
revision=2
wrksrc="linux-${version}"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.kernel.org"