Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a88098bd authored by Mark Knibbs's avatar Mark Knibbs Committed by Greg Kroah-Hartman
Browse files

USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init() 



The timeout argument to usb_stor_control_msg() is specified in jiffies, not
milliseconds.

Signed-off-by: default avatarMark Knibbs <markk@clara.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4473d054

drivers/usb/storage/initializers.c

+2 −2
Original line number Diff line number Diff line
@@ -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, 5000);

			0x01, 0x0, us->iobuf, 0x1, 5 * HZ);

	usb_stor_dbg(us, "-- result is %d\n", result);



	return 0;
@@ -100,7 +100,7 @@ int usb_stor_huawei_e220_init(struct us_data *us) 
	result = usb_stor_control_msg(us, us->send_ctrl_pipe,

				      USB_REQ_SET_FEATURE,

				      USB_TYPE_STANDARD | USB_RECIP_DEVICE,

				      0x01, 0x0, NULL, 0x0, 1000);

				      0x01, 0x0, NULL, 0x0, 1 * HZ);

	usb_stor_dbg(us, "Huawei mode set result is %d\n", result);

	return 0;

}