diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:54:33 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 14:54:33 -0500 |
| commit | 312fef7d18adda2be822d31916547f84ed6af28b (patch) | |
| tree | 095d936b751b0a92946fcf710fb74dea7f8f33f7 /drivers/bluetooth/bfusb.c | |
| parent | 5e819059a20b0fc5a71875f28b4cae359e38d85a (diff) | |
| parent | 2aeabcbedd51aef94b61d05b57246d1db4984453 (diff) | |
| download | linux-312fef7d18adda2be822d31916547f84ed6af28b.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
Conflicts:
net/bluetooth/l2cap_sock.c
net/bluetooth/mgmt.c
Diffstat (limited to 'drivers/bluetooth/bfusb.c')
| -rw-r--r-- | drivers/bluetooth/bfusb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/bluetooth/bfusb.c b/drivers/bluetooth/bfusb.c index 61b591470a90..a936763b8c3d 100644 --- a/drivers/bluetooth/bfusb.c +++ b/drivers/bluetooth/bfusb.c @@ -751,9 +751,7 @@ static void bfusb_disconnect(struct usb_interface *intf) bfusb_close(hdev); - if (hci_unregister_dev(hdev) < 0) - BT_ERR("Can't unregister HCI device %s", hdev->name); - + hci_unregister_dev(hdev); hci_free_dev(hdev); } |