diff options
| author | Bruce J Beare <bruce.j.beare@intel.com> | 2016-01-07 17:06:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-07 17:06:00 +0000 |
| commit | d4e9b5d7666d60563818f8f63eb185f6632174a4 (patch) | |
| tree | 33ef5f2e2fd8b8ed2a26b65e39e96886ebeed680 | |
| parent | 298a18e9ab8f9f4aa337d3acdbd20e9fdccc69aa (diff) | |
| parent | 926e6cb62bc1c9af79cd0229a3abbb9617f9cbc1 (diff) | |
| download | edison-v3.10-d4e9b5d7666d60563818f8f63eb185f6632174a4.tar.gz | |
Merge "xhci: xhci_configure_endpoint: use non-interruptible wait_for_completion" into edison-3.10
| -rw-r--r-- | drivers/usb/host/xhci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index f9446d0dac5..7c02bf82ba4 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -2630,7 +2630,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci, spin_unlock_irqrestore(&xhci->lock, flags); /* Wait for the configure endpoint command to complete */ - timeleft = wait_for_completion_interruptible_timeout( + timeleft = wait_for_completion_timeout( cmd_completion, XHCI_CMD_DEFAULT_TIMEOUT); if (timeleft <= 0) { |