diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
| commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
| tree | 0f5fc519a68faca5318c296315c9b6c502907056 /drivers/usb/host/ohci-ps3.c | |
| parent | x86: apic reset counter on shutdown (diff) | |
| parent | Linux 2.6.28-rc9 (diff) | |
| download | linux-1ccedb7cdba6886939dd8b4c8f965a826f696e56.tar.xz linux-1ccedb7cdba6886939dd8b4c8f965a826f696e56.zip | |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'drivers/usb/host/ohci-ps3.c')
| -rw-r--r-- | drivers/usb/host/ohci-ps3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c index 2089d8a46c4b..3c1a3b5f89f1 100644 --- a/drivers/usb/host/ohci-ps3.c +++ b/drivers/usb/host/ohci-ps3.c @@ -192,7 +192,7 @@ fail_start: return result; } -static int ps3_ohci_remove (struct ps3_system_bus_device *dev) +static int ps3_ohci_remove(struct ps3_system_bus_device *dev) { unsigned int tmp; struct usb_hcd *hcd = @@ -205,6 +205,7 @@ static int ps3_ohci_remove (struct ps3_system_bus_device *dev) tmp = hcd->irq; + ohci_shutdown(hcd); usb_remove_hcd(hcd); ps3_system_bus_set_driver_data(dev, NULL); |