diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-10-02 21:56:19 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-02 21:56:19 +0400 |
| commit | f6cd071891c5c7971866fda8340202b73ce35206 (patch) | |
| tree | 95dbb8769f69db80f1fbcca9ee813ce474b99a22 /drivers/bluetooth/btusb.c | |
| parent | 574a7930d7c4d0fe4295868e52a5277bd9595b5e (diff) | |
| parent | 9c238ca8ec79c38ab22762b44aeaf7a42fc97b18 (diff) | |
| download | linux-f6cd071891c5c7971866fda8340202b73ce35206.tar.xz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/btusb.c')
| -rw-r--r-- | drivers/bluetooth/btusb.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index a423b84a0ed3..edfc17bfcd44 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -268,8 +268,6 @@ struct btusb_data { struct usb_interface *intf; struct usb_interface *isoc; - spinlock_t lock; - unsigned long flags; struct work_struct work; @@ -2002,8 +2000,6 @@ static int btusb_probe(struct usb_interface *intf, data->udev = interface_to_usbdev(intf); data->intf = intf; - spin_lock_init(&data->lock); - INIT_WORK(&data->work, btusb_work); INIT_WORK(&data->waker, btusb_waker); init_usb_anchor(&data->deferred); |