git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: xhci: Fix panic if disconnect
[pandora-kernel.git]
/
drivers
/
usb
/
host
/
ohci-at91.c
diff --git
a/drivers/usb/host/ohci-at91.c
b/drivers/usb/host/ohci-at91.c
index
95a9fec
..
a60c7aa
100644
(file)
--- a/
drivers/usb/host/ohci-at91.c
+++ b/
drivers/usb/host/ohci-at91.c
@@
-199,7
+199,7
@@
static void usb_hcd_at91_remove(struct usb_hcd *hcd,
/*-------------------------------------------------------------------------*/
static int __devinit
/*-------------------------------------------------------------------------*/
static int __devinit
-ohci_at91_
star
t (struct usb_hcd *hcd)
+ohci_at91_
rese
t (struct usb_hcd *hcd)
{
struct at91_usbh_data *board = hcd->self.controller->platform_data;
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
{
struct at91_usbh_data *board = hcd->self.controller->platform_data;
struct ohci_hcd *ohci = hcd_to_ohci (hcd);
@@
-209,6
+209,14
@@
ohci_at91_start (struct usb_hcd *hcd)
return ret;
ohci->num_ports = board->ports;
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) {
err("can't start %s", hcd->self.bus_name);
if ((ret = ohci_run(ohci)) < 0) {
err("can't start %s", hcd->self.bus_name);
@@
-390,6
+398,7
@@
static const struct hc_driver ohci_at91_hc_driver = {
/*
* basic lifecycle operations
*/
/*
* basic lifecycle operations
*/
+ .reset = ohci_at91_reset,
.start = ohci_at91_start,
.stop = ohci_stop,
.shutdown = ohci_shutdown,
.start = ohci_at91_start,
.stop = ohci_stop,
.shutdown = ohci_shutdown,