From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 5 Nov 2014 19:12:17 +0000 (-0800)
Subject: Revert "storage: Replace magic number with define in usb_stor_euscsi_init()"
X-Git-Tag: v3.18-rc4~8^2~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ac0225f94f2af14d5db5a3ca2e9b151bb5488a52;p=~emulex%2Finfiniband.git

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>
---

diff --git a/drivers/usb/storage/initializers.c b/drivers/usb/storage/initializers.c
index 4bc2fc98636..5a8b5ff1e45 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;