aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/xhci.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 64f82b999221..023175eab07d 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -696,9 +696,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
696{ 696{
697 u32 command, temp = 0; 697 u32 command, temp = 0;
698 struct usb_hcd *hcd = xhci_to_hcd(xhci); 698 struct usb_hcd *hcd = xhci_to_hcd(xhci);
699 int old_state, retval; 699 int retval;
700 700
701 old_state = hcd->state;
702 if (time_before(jiffies, xhci->next_statechange)) 701 if (time_before(jiffies, xhci->next_statechange))
703 msleep(100); 702 msleep(100);
704 703
@@ -782,10 +781,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
782 */ 781 */
783 782
784 set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); 783 set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
785 if (!hibernated)
786 hcd->state = old_state;
787 else
788 hcd->state = HC_STATE_SUSPENDED;
789 784
790 spin_unlock_irq(&xhci->lock); 785 spin_unlock_irq(&xhci->lock);
791 return 0; 786 return 0;