diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 11:46:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-16 11:46:03 -0500 |
| commit | d59abb9325ae5eb8fd28440d80f820b945887541 (patch) | |
| tree | 6ba86796569a8b478a959c2c76c8bfb2bde34522 /drivers/usb/host/ohci-jz4740.c | |
| parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) | |
| parent | 3d724fa513cd1bd06d3457ccda36941f3606d048 (diff) | |
Merge branch 3.13-rc4 into usb-next
Diffstat (limited to 'drivers/usb/host/ohci-jz4740.c')
| -rw-r--r-- | drivers/usb/host/ohci-jz4740.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/ohci-jz4740.c b/drivers/usb/host/ohci-jz4740.c index d4ef53990d73..efe31f3ab4ea 100644 --- a/drivers/usb/host/ohci-jz4740.c +++ b/drivers/usb/host/ohci-jz4740.c | |||
| @@ -217,6 +217,7 @@ static int jz4740_ohci_probe(struct platform_device *pdev) | |||
| 217 | dev_err(&pdev->dev, "Failed to add hcd: %d\n", ret); | 217 | dev_err(&pdev->dev, "Failed to add hcd: %d\n", ret); |
| 218 | goto err_disable; | 218 | goto err_disable; |
| 219 | } | 219 | } |
| 220 | device_wakeup_enable(hcd->self.controller); | ||
| 220 | 221 | ||
| 221 | return 0; | 222 | return 0; |
| 222 | 223 | ||