xhci: correct the usage of USB_CTRL_SET_TIMEOUT
Subsystems (2)
PATCH v2 1/1 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 <[email protected]>
--- drivers/usb/host/xhci-hub.c | 2 +- drivers/usb/host/xhci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/usb/host/xhci-hub.c +1 -1
@@ -295,7 +295,7 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)/* Wait for last stop endpoint command to finish */ timeleft =wait_for_completion_interruptible_timeout ( cmd->completion, -USB_CTRL_SET_TIMEOUT ); +XHCI_CMD_DEFAULT_TIMEOUT );if (timeleft <=0 ) {xhci_warn (xhci,"%s while waiting for stop endpoint command\n" , timeleft ==0 ?"Timeout" :"Signal" );
drivers/usb/host/xhci.c +1 -1
@@ -3486,7 +3486,7 @@ int xhci_discover_or_reset_device(struct usb_hcd *hcd, struct usb_device *udev)/* Wait for the Reset Device command to finish */ timeleft =wait_for_completion_interruptible_timeout ( reset_device_cmd->completion, -USB_CTRL_SET_TIMEOUT ); +XHCI_CMD_DEFAULT_TIMEOUT );if (timeleft <=0 ) {xhci_warn (xhci,"%s while waiting for reset device command\n" , timeleft ==0 ?"Timeout" :"Signal" );
Signature · 1 line
1.7.0.4