diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 17:56:17 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 17:56:17 +0200 |
| commit | 6ed962a208cb72cff29a107d6c73247526017ddb (patch) | |
| tree | 2bd574d8ab1db79b369735ba0519a66760019189 /drivers/usb/host/ehci-s5p.c | |
| parent | Linux 3.1-rc4 (diff) | |
| parent | USB: pl2303: remove unreachable code (diff) | |
| download | linux-6ed962a208cb72cff29a107d6c73247526017ddb.tar.xz linux-6ed962a208cb72cff29a107d6c73247526017ddb.zip | |
Merge 3.1-rc4 into usb-next
This was done to resolve a conflict in this file:
drivers/usb/host/xhci-ring.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ehci-s5p.c')
| -rw-r--r-- | drivers/usb/host/ehci-s5p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 9e77f1c8bdbd..64bcf66d3040 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c @@ -270,7 +270,7 @@ static int s5p_ehci_resume(struct device *dev) /* here we "know" root ports should always stay powered */ ehci_port_power(ehci, 1); - hcd->state = HC_STATE_SUSPENDED; + ehci->rh_state = EHCI_RH_SUSPENDED; return 0; } |