diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 10:23:23 -0500 |
| commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
| tree | 0f5fc519a68faca5318c296315c9b6c502907056 /drivers/usb/host/ohci-ps3.c | |
| parent | a98f8fd24fb24fcb9a359553e64dd6aac5cf4279 (diff) | |
| parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
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: | |||
| 192 | return result; | 192 | return result; |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | static int ps3_ohci_remove (struct ps3_system_bus_device *dev) | 195 | static int ps3_ohci_remove(struct ps3_system_bus_device *dev) |
| 196 | { | 196 | { |
| 197 | unsigned int tmp; | 197 | unsigned int tmp; |
| 198 | struct usb_hcd *hcd = | 198 | struct usb_hcd *hcd = |
| @@ -205,6 +205,7 @@ static int ps3_ohci_remove (struct ps3_system_bus_device *dev) | |||
| 205 | 205 | ||
| 206 | tmp = hcd->irq; | 206 | tmp = hcd->irq; |
| 207 | 207 | ||
| 208 | ohci_shutdown(hcd); | ||
| 208 | usb_remove_hcd(hcd); | 209 | usb_remove_hcd(hcd); |
| 209 | 210 | ||
| 210 | ps3_system_bus_set_driver_data(dev, NULL); | 211 | ps3_system_bus_set_driver_data(dev, NULL); |