diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-09 11:19:21 -0500 |
| commit | 2a074f4a54d11ec0ce16b35e9a88feaa2fd886aa (patch) | |
| tree | b81ab05dac66fa0cccf44896d2d86be7ba52aa49 /drivers/usb/core/driver.c | |
| parent | 23c7b521c250b261dd97a7a06d5a2e74b56233d5 (diff) | |
| parent | 8bd4bb7a35e8ebb015a531218614c48e10a3c4ee (diff) | |
Merge branch 'topic/quirk-cleanup' into topic/hda
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); |