]> git.baikalelectronics.ru Git - kernel.git/commit
xhci: correct the usage of USB_CTRL_SET_TIMEOUT
authorxiao jin <jin.xiao@intel.com>
Fri, 11 Oct 2013 00:57:03 +0000 (08:57 +0800)
committerSarah Sharp <sarah.a.sharp@linux.intel.com>
Wed, 16 Oct 2013 19:24:23 +0000 (12:24 -0700)
commitdc8e1bad50b4b939d1e6e9039988f116e3a2f4c2
tree9f5cd40b61aa8b7294f948f3ad3bfe08899afce7
parent35d46af20c1339f2ba59e689caff18aaaf9e6d02
xhci: correct the usage of USB_CTRL_SET_TIMEOUT

The usage of USB_CTRL_SET_TIMEOUT in xhci is incorrect.
The definition of USB_CTRL_SET_TIMEOUT is 5000ms. The
input timeout to wait_for_completion_interruptible_timeout
is jiffies. That makes the timeout be longer than what
we want, such as 50s in some platform.

The patch is to use XHCI_CMD_DEFAULT_TIMEOUT instead of
USB_CTRL_SET_TIMEOUT as command completion event timeout.

Signed-off-by: xiao jin <jin.xiao@intel.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>
drivers/usb/host/xhci-hub.c
drivers/usb/host/xhci.c