summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ehci-s5p.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 16:09:49 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 16:10:29 -0800
commit332ceddb8c4ba2367abcb9a94a69386b2785441b (patch)
treeb3288bcda95b165172b13e7a8ad2f2c1947b9953 /drivers/usb/host/ehci-s5p.c
parenta36ae95c4e220afb976dd9d0d813d01e882b7b59 (diff)
parentaaa0ef289afe9186f81e2340114ea413eef0492a (diff)
downloadop-kernel-dev-332ceddb8c4ba2367abcb9a94a69386b2785441b.zip
op-kernel-dev-332ceddb8c4ba2367abcb9a94a69386b2785441b.tar.gz
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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-s5p.c b/drivers/usb/host/ehci-s5p.c
index 8aac020..293f741 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)
/* cache this readonly data; minimize chip reads */
ehci->hcs_params = readl(&ehci->caps->hcs_params);
+ ehci_reset(ehci);
+
err = usb_add_hcd(hcd, irq, IRQF_SHARED);
if (err) {
dev_err(&pdev->dev, "Failed to add USB HCD\n");
OpenPOWER on IntegriCloud