From 5d1dedd29cd62d4115c7fcb86ddca381d450f069 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 9 Aug 2013 09:11:03 +0200 Subject: [PATCH] linux3.10: added a patch from linux-usb@ for some USB disks resulting in ETIMEDOUT. --- ...ble-inquiry-if-skip-vpd-pages-is-set.patch | 24 +++++++++++++++++++ srcpkgs/linux3.10/template | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/linux3.10/patches/scsi-disable-inquiry-if-skip-vpd-pages-is-set.patch diff --git a/srcpkgs/linux3.10/patches/scsi-disable-inquiry-if-skip-vpd-pages-is-set.patch b/srcpkgs/linux3.10/patches/scsi-disable-inquiry-if-skip-vpd-pages-is-set.patch new file mode 100644 index 00000000000..7e653547b35 --- /dev/null +++ b/srcpkgs/linux3.10/patches/scsi-disable-inquiry-if-skip-vpd-pages-is-set.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 +Acked-by: Alan Stern +Tested-by: Stuart Foster +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) diff --git a/srcpkgs/linux3.10/template b/srcpkgs/linux3.10/template index dd9121003d5..8b5015e3b3e 100644 --- a/srcpkgs/linux3.10/template +++ b/srcpkgs/linux3.10/template @@ -2,7 +2,7 @@ # pkgname=linux3.10 version=3.10.5 -revision=1 +revision=2 wrksrc="linux-${version}" maintainer="Juan RP " homepage="http://www.kernel.org"