diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 17:16:30 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-11-24 17:16:30 +1100 |
| commit | 1e43bee9c70654b4d52472c19e5f0a0cc18b6b36 (patch) | |
| tree | ff601ec0c0d14125d0324f21b3c7e6d5e19fa252 /drivers/bluetooth/btusb.c | |
| parent | 7d6709a20866a885916214590b7c394a21be9e25 (diff) | |
| parent | a8a8a669ea13d792296737505adc43ccacf3a648 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 2fb38027f3b..44bc8bbabf5 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -600,11 +600,13 @@ static int btusb_close(struct hci_dev *hdev) btusb_stop_traffic(data); err = usb_autopm_get_interface(data->intf); if (err < 0) - return 0; + goto failed; data->intf->needs_remote_wakeup = 0; usb_autopm_put_interface(data->intf); +failed: + usb_scuttle_anchored_urbs(&data->deferred); return 0; } |