aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorGiacomo Lozito <james@develia.org>2009-07-13 23:23:33 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-28 14:31:09 -0700
commit7a777919bbeec3eac1d7904a728a60e9c2bb9c67 (patch)
tree8a81edc5423c10a815d8a85e1ba80ed352b3e57c /drivers/usb/storage
parent5f4fab91f2b12c12f0506b4da49ed199db8c64ed (diff)
downloadkernel_samsung_aries-7a777919bbeec3eac1d7904a728a60e9c2bb9c67.zip
kernel_samsung_aries-7a777919bbeec3eac1d7904a728a60e9c2bb9c67.tar.gz
kernel_samsung_aries-7a777919bbeec3eac1d7904a728a60e9c2bb9c67.tar.bz2
USB: storage: raise timeout in usb_stor_Bulk_max_lun
Requests to get max LUN, for certain USB storage devices, require a longer timeout before a correct reply is returned. This happens for a Realtek USB Card Reader (0bda:0152), which has a max LUN of 3 but is set to 0, thus losing functionality, because of the timeout occurring too quickly. Raising the timeout value fixes the issue and might help other devices to return a correct max LUN value as well. Signed-off-by: Giacomo Lozito <james@develia.org> Acked-by: Alan Stern <stern@rowland.harvard.edu> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/transport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index fcb3202..e20dc52 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -961,7 +961,7 @@ int usb_stor_Bulk_max_lun(struct us_data *us)
US_BULK_GET_MAX_LUN,
USB_DIR_IN | USB_TYPE_CLASS |
USB_RECIP_INTERFACE,
- 0, us->ifnum, us->iobuf, 1, HZ);
+ 0, us->ifnum, us->iobuf, 1, 10*HZ);
US_DEBUGP("GetMaxLUN command result is %d, data is %d\n",
result, us->iobuf[0]);