aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@googlemail.com>2012-02-09 15:58:31 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:38 -0500
commit9ab875affbe61b2c88685c342461c9a367ab7a3e (patch)
treec3386a10c79f33eab3cddcf258453ae4129ec9a5 /drivers/bluetooth
parent2dd106887d6503819f2cedc408497023547439bb (diff)
Bluetooth: btusb: Remove device lock on release
Recently we changed the way how we release driver-data. A driver is now responsible of destroying the data so we no longer need the device lock on deinitialization in btusb driver. Signed-off-by: David Herrmann <dh.herrmann@googlemail.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r--drivers/bluetooth/btusb.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index f4fb256d6ca6..066d5ec83a9b 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -1079,9 +1079,6 @@ static void btusb_disconnect(struct usb_interface *intf)
1079 return; 1079 return;
1080 1080
1081 hdev = data->hdev; 1081 hdev = data->hdev;
1082
1083 hci_dev_hold(hdev);
1084
1085 usb_set_intfdata(data->intf, NULL); 1082 usb_set_intfdata(data->intf, NULL);
1086 1083
1087 if (data->isoc) 1084 if (data->isoc)
@@ -1094,8 +1091,6 @@ static void btusb_disconnect(struct usb_interface *intf)
1094 else if (data->isoc) 1091 else if (data->isoc)
1095 usb_driver_release_interface(&btusb_driver, data->isoc); 1092 usb_driver_release_interface(&btusb_driver, data->isoc);
1096 1093
1097 hci_dev_put(hdev);
1098
1099 hci_free_dev(hdev); 1094 hci_free_dev(hdev);
1100 kfree(data); 1095 kfree(data);
1101} 1096}