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/host/fhci-hcd.c | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| parent | 3d724fa513cd1bd06d3457ccda36941f3606d048 (diff) | |
| download | op-kernel-dev-d59abb9325ae5eb8fd28440d80f820b945887541.zip op-kernel-dev-d59abb9325ae5eb8fd28440d80f820b945887541.tar.gz | |
Merge branch 3.13-rc4 into usb-next
Diffstat (limited to 'drivers/usb/host/fhci-hcd.c')
| -rw-r--r-- | drivers/usb/host/fhci-hcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 0551c0a..1cf68ea 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c @@ -754,6 +754,8 @@ static int of_fhci_probe(struct platform_device *ofdev) if (ret < 0) goto err_add_hcd; + device_wakeup_enable(hcd->self.controller); + fhci_dfs_create(fhci); return 0; |
