summaryrefslogtreecommitdiff
path: root/drivers/usb/host/ehci-pmcmsp.c
diff options
context:
space:
mode:
authorPeter Chen <peter.chen@freescale.com>2013-11-05 06:46:02 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-12-09 06:06:46 +0400
commit3c9740a117d40a74412775b5d3fe2b88a7635a0e (patch)
tree742113563df52e151dc96277fa968b9eca19bc3e /drivers/usb/host/ehci-pmcmsp.c
parentc4962e03f4bbad63c8356e9466db6e0df4144ed9 (diff)
downloadlinux-3c9740a117d40a74412775b5d3fe2b88a7635a0e.tar.xz
usb: hcd: move controller wakeup setting initialization to individual driver
Individual controller driver has different requirement for wakeup setting, so move it from core to itself. In order to align with current etting the default wakeup setting is enabled (except for chipidea host). Pass compile test with below commands: make O=outout/all allmodconfig make -j$CPU_NUM O=outout/all drivers/usb Signed-off-by: Peter Chen <peter.chen@freescale.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/ehci-pmcmsp.c')
-rw-r--r--drivers/usb/host/ehci-pmcmsp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
index 893b707f0000..af3974a5e7c2 100644
--- a/drivers/usb/host/ehci-pmcmsp.c
+++ b/drivers/usb/host/ehci-pmcmsp.c
@@ -210,8 +210,10 @@ int usb_hcd_msp_probe(const struct hc_driver *driver,
retval = usb_add_hcd(hcd, res->start, IRQF_SHARED);
- if (retval == 0)
+ if (retval == 0) {
+ device_wakeup_enable(hcd->self.controller);
return 0;
+ }
usb_remove_hcd(hcd);
err3: