From e019ea2916626e9f5ed07632ac5e16a2cf432602 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Wed, 9 May 2012 10:48:54 +0200 Subject: [PATCH] --- yaml --- r: 303879 b: refs/heads/master c: 07e4e556eff4938eb2edf2591de3aa7d7fb82b52 h: refs/heads/master i: 303877: 5eb8780e06a229359c671f0cc907aed69ab0e747 303875: 6a08a8842b5c520964a61710b09efde69bbfe07b 303871: b70ed04012198cddc7d8eda33b99570c9215a21f v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ohci-at91.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a1989901bbdb..d04f188623cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a82f612fa3aadb5676184ae202903f5a42e4f4a +refs/heads/master: 07e4e556eff4938eb2edf2591de3aa7d7fb82b52 diff --git a/trunk/drivers/usb/host/ohci-at91.c b/trunk/drivers/usb/host/ohci-at91.c index d4608c2d5b64..a665b3eaa746 100644 --- a/trunk/drivers/usb/host/ohci-at91.c +++ b/trunk/drivers/usb/host/ohci-at91.c @@ -223,7 +223,7 @@ static void __devexit usb_hcd_at91_remove(struct usb_hcd *hcd, /*-------------------------------------------------------------------------*/ static int __devinit -ohci_at91_start (struct usb_hcd *hcd) +ohci_at91_reset (struct usb_hcd *hcd) { struct at91_usbh_data *board = hcd->self.controller->platform_data; struct ohci_hcd *ohci = hcd_to_ohci (hcd); @@ -233,6 +233,14 @@ ohci_at91_start (struct usb_hcd *hcd) return ret; ohci->num_ports = board->ports; + return 0; +} + +static int __devinit +ohci_at91_start (struct usb_hcd *hcd) +{ + struct ohci_hcd *ohci = hcd_to_ohci (hcd); + int ret; if ((ret = ohci_run(ohci)) < 0) { dev_err(hcd->self.controller, "can't start %s\n", @@ -419,6 +427,7 @@ static const struct hc_driver ohci_at91_hc_driver = { /* * basic lifecycle operations */ + .reset = ohci_at91_reset, .start = ohci_at91_start, .stop = ohci_stop, .shutdown = ohci_shutdown,