diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 19:09:49 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-12-09 19:10:29 -0500 |
| commit | 332ceddb8c4ba2367abcb9a94a69386b2785441b (patch) | |
| tree | b3288bcda95b165172b13e7a8ad2f2c1947b9953 /drivers/usb/host/ehci-s5p.c | |
| parent | a36ae95c4e220afb976dd9d0d813d01e882b7b59 (diff) | |
| parent | aaa0ef289afe9186f81e2340114ea413eef0492a (diff) | |
Merge branch 'for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-linux into usb-next
* 'for-usb' of git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-linux:
usb: PS3 EHCI QH read work-around
usb: Fix PS3 EHCI suspend
usb: PS3 EHCI HC reset work-around
usb: Remove ehci_reset call from ehci_run
Diffstat (limited to 'drivers/usb/host/ehci-s5p.c')
| -rw-r--r-- | drivers/usb/host/ehci-s5p.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c index 8aac02019195..293f7412992e 100644 --- a/drivers/usb/host/ehci-s5p.c +++ b/drivers/usb/host/ehci-s5p.c | |||
| @@ -134,6 +134,8 @@ static int __devinit s5p_ehci_probe(struct platform_device *pdev) | |||
| 134 | /* cache this readonly data; minimize chip reads */ | 134 | /* cache this readonly data; minimize chip reads */ |
| 135 | ehci->hcs_params = readl(&ehci->caps->hcs_params); | 135 | ehci->hcs_params = readl(&ehci->caps->hcs_params); |
| 136 | 136 | ||
| 137 | ehci_reset(ehci); | ||
| 138 | |||
| 137 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); | 139 | err = usb_add_hcd(hcd, irq, IRQF_SHARED); |
| 138 | if (err) { | 140 | if (err) { |
| 139 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); | 141 | dev_err(&pdev->dev, "Failed to add USB HCD\n"); |