summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-05 22:12:17 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-05 22:12:17 +0300
commitac0225f94f2af14d5db5a3ca2e9b151bb5488a52 (patch)
treef3cb878601ffbf8b9739a2169ace814f8f04c72f /drivers/usb
parentb2108f1e519e983e5dd5712b3a44f7366ab509e4 (diff)
downloadlinux-ac0225f94f2af14d5db5a3ca2e9b151bb5488a52.tar.xz
Revert "storage: Replace magic number with define in usb_stor_euscsi_init()"
This reverts commit bda9893c50fb56253d3c206c14e3f933e5f68b3c as it was incorrect. Reported-by: Mark Knibbs <markk@clara.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/storage/initializers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c
index 4bc2fc98636e..5a8b5ff1e45b 100644
--- a/drivers/usb/storage/initializers.c
+++ b/drivers/usb/storage/initializers.c
@@ -52,7 +52,7 @@ int usb_stor_euscsi_init(struct us_data *us)
us->iobuf[0] = 0x1;
result = usb_stor_control_msg(us, us->send_ctrl_pipe,
0x0C, USB_RECIP_INTERFACE | USB_TYPE_VENDOR,
- 0x01, 0x0, us->iobuf, 0x1, USB_CTRL_SET_TIMEOUT);
+ 0x01, 0x0, us->iobuf, 0x1, 5000);
usb_stor_dbg(us, "-- result is %d\n", result);
return 0;