From 121f99b98fd8625523d4347216ce449b47eafe0f Mon Sep 17 00:00:00 2001 From: Andiry Xu Date: Thu, 6 Jan 2011 15:43:17 +0800 Subject: [PATCH] --- yaml --- r: 235419 b: refs/heads/master c: 019a35f1142b1cd153c8a38338515e633ec0cf77 h: refs/heads/master i: 235417: a278f053b29da200d247d2d9b8a0ce6ca861eb7d 235415: e964249d76c597c5468bdfe4c535e558feed2da1 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 79f3427bbd22..9119977d3016 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 518e848ea8e2932ce18ce2daef8ad5f55a145f27 +refs/heads/master: 019a35f1142b1cd153c8a38338515e633ec0cf77 diff --git a/trunk/drivers/usb/host/xhci.c b/trunk/drivers/usb/host/xhci.c index 64f82b999221..023175eab07d 100644 --- a/trunk/drivers/usb/host/xhci.c +++ b/trunk/drivers/usb/host/xhci.c @@ -696,9 +696,8 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) { u32 command, temp = 0; struct usb_hcd *hcd = xhci_to_hcd(xhci); - int old_state, retval; + int retval; - old_state = hcd->state; if (time_before(jiffies, xhci->next_statechange)) msleep(100); @@ -782,10 +781,6 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) */ set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); - if (!hibernated) - hcd->state = old_state; - else - hcd->state = HC_STATE_SUSPENDED; spin_unlock_irq(&xhci->lock); return 0;