diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:49:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 13:49:48 -0400 |
| commit | 18ffa418aead13c56515ac74cd26105102128aca (patch) | |
| tree | 2096ea8db3b2594bd25ad39a70edc691219f669b /drivers/usb/core/driver.c | |
| parent | ab76f3d771590d5c89faa3219559c5d3fc0ce0c2 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge commit 'v2.6.29' into x86/setup-lzma
Diffstat (limited to 'drivers/usb/core/driver.c')
| -rw-r--r-- | drivers/usb/core/driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index 98760553bc95..d0a21a5f8201 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -284,7 +284,7 @@ static int usb_unbind_interface(struct device *dev) | |||
| 284 | * supports "soft" unbinding. | 284 | * supports "soft" unbinding. |
| 285 | */ | 285 | */ |
| 286 | if (!driver->soft_unbind) | 286 | if (!driver->soft_unbind) |
| 287 | usb_disable_interface(udev, intf); | 287 | usb_disable_interface(udev, intf, false); |
| 288 | 288 | ||
| 289 | driver->disconnect(intf); | 289 | driver->disconnect(intf); |
| 290 | usb_cancel_queued_reset(intf); | 290 | usb_cancel_queued_reset(intf); |