diff options
| author |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2013-12-16 08:46:03 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2013-12-16 08:46:03 -0800 |
| commit | d59abb9325ae5eb8fd28440d80f820b945887541 (patch) | |
| tree | 6ba86796569a8b478a959c2c76c8bfb2bde34522 /drivers/usb/musb | |
| parent | Linux 3.13-rc4 (diff) | |
| parent | USB: emi62: Provide the correct bitstream firmware (diff) | |
| download | linux-d59abb9325ae5eb8fd28440d80f820b945887541.tar.gz linux-d59abb9325ae5eb8fd28440d80f820b945887541.tar.bz2 linux-d59abb9325ae5eb8fd28440d80f820b945887541.zip | |
Merge branch 3.13-rc4 into usb-next
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/musb_host.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 6582a20bec05..e2083757e87c 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -2657,6 +2657,7 @@ int musb_host_setup(struct musb *musb, int power_budget) if (ret < 0) return ret; + device_wakeup_enable(hcd->self.controller); return 0; } |