diff options
Diffstat (limited to 'drivers/bluetooth/btusb.c')
-rw-r--r-- | drivers/bluetooth/btusb.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 9cf3796f92aa..247b1062cb9a 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c | |||
@@ -940,9 +940,6 @@ static int btusb_open(struct hci_dev *hdev) | |||
940 | 940 | ||
941 | data->intf->needs_remote_wakeup = 1; | 941 | data->intf->needs_remote_wakeup = 1; |
942 | 942 | ||
943 | if (test_and_set_bit(HCI_RUNNING, &hdev->flags)) | ||
944 | goto done; | ||
945 | |||
946 | if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags)) | 943 | if (test_and_set_bit(BTUSB_INTR_RUNNING, &data->flags)) |
947 | goto done; | 944 | goto done; |
948 | 945 | ||
@@ -965,7 +962,6 @@ done: | |||
965 | 962 | ||
966 | failed: | 963 | failed: |
967 | clear_bit(BTUSB_INTR_RUNNING, &data->flags); | 964 | clear_bit(BTUSB_INTR_RUNNING, &data->flags); |
968 | clear_bit(HCI_RUNNING, &hdev->flags); | ||
969 | usb_autopm_put_interface(data->intf); | 965 | usb_autopm_put_interface(data->intf); |
970 | return err; | 966 | return err; |
971 | } | 967 | } |
@@ -984,9 +980,6 @@ static int btusb_close(struct hci_dev *hdev) | |||
984 | 980 | ||
985 | BT_DBG("%s", hdev->name); | 981 | BT_DBG("%s", hdev->name); |
986 | 982 | ||
987 | if (!test_and_clear_bit(HCI_RUNNING, &hdev->flags)) | ||
988 | return 0; | ||
989 | |||
990 | cancel_work_sync(&data->work); | 983 | cancel_work_sync(&data->work); |
991 | cancel_work_sync(&data->waker); | 984 | cancel_work_sync(&data->waker); |
992 | 985 | ||