From efcd3f168f2cd1a741c1f5263636091d63d5ada5 Mon Sep 17 00:00:00 2001 From: Vincent Palatin Date: Thu, 1 Nov 2012 11:05:28 -0700 Subject: [PATCH] --- yaml --- r: 338571 b: refs/heads/master c: 57465109ce6c62e57b98788496c823c2067253c0 h: refs/heads/master i: 338569: c38fd48c79652b73cf1c43d87c0388433715b97b 338567: 15dec47ec3c8a111c80f70bc06d815b76d74b331 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-exynos.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 70757b9b1e10..89a43e20e296 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1bb67a7a2a5a5ff49b0ef4d191725769243e639 +refs/heads/master: 57465109ce6c62e57b98788496c823c2067253c0 diff --git a/trunk/drivers/usb/host/ohci-exynos.c b/trunk/drivers/usb/host/ohci-exynos.c index 2f303295b428..6a30fc5bec93 100644 --- a/trunk/drivers/usb/host/ohci-exynos.c +++ b/trunk/drivers/usb/host/ohci-exynos.c @@ -23,6 +23,11 @@ struct exynos_ohci_hcd { struct clk *clk; }; +static int ohci_exynos_reset(struct usb_hcd *hcd) +{ + return ohci_init(hcd_to_ohci(hcd)); +} + static int ohci_exynos_start(struct usb_hcd *hcd) { struct ohci_hcd *ohci = hcd_to_ohci(hcd); @@ -30,10 +35,6 @@ static int ohci_exynos_start(struct usb_hcd *hcd) ohci_dbg(ohci, "ohci_exynos_start, ohci:%p", ohci); - ret = ohci_init(ohci); - if (ret < 0) - return ret; - ret = ohci_run(ohci); if (ret < 0) { dev_err(hcd->self.controller, "can't start %s\n", @@ -53,6 +54,7 @@ static const struct hc_driver exynos_ohci_hc_driver = { .irq = ohci_irq, .flags = HCD_MEMORY|HCD_USB11, + .reset = ohci_exynos_reset, .start = ohci_exynos_start, .stop = ohci_stop, .shutdown = ohci_shutdown,