summaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btusb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/bluetooth/btusb.c')
-rw-r--r--drivers/bluetooth/btusb.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ed455de598ea..a9c35ebb30f8 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -384,6 +384,9 @@ static const struct usb_device_id blacklist_table[] = {
384 { USB_DEVICE(0x13d3, 0x3526), .driver_info = BTUSB_REALTEK }, 384 { USB_DEVICE(0x13d3, 0x3526), .driver_info = BTUSB_REALTEK },
385 { USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK }, 385 { USB_DEVICE(0x0b05, 0x185c), .driver_info = BTUSB_REALTEK },
386 386
387 /* Additional Realtek 8822CE Bluetooth devices */
388 { USB_DEVICE(0x04ca, 0x4005), .driver_info = BTUSB_REALTEK },
389
387 /* Silicon Wave based devices */ 390 /* Silicon Wave based devices */
388 { USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_SWAVE }, 391 { USB_DEVICE(0x0c10, 0x0000), .driver_info = BTUSB_SWAVE },
389 392
@@ -1201,10 +1204,6 @@ static int btusb_open(struct hci_dev *hdev)
1201 } 1204 }
1202 1205
1203 data->intf->needs_remote_wakeup = 1; 1206 data->intf->needs_remote_wakeup = 1;
1204 /* device specific wakeup source enabled and required for USB
1205 * remote wakeup while host is suspended
1206 */
1207 device_wakeup_enable(&data->udev->dev);
1208 1207
1209 /* Disable device remote wakeup when host is suspended 1208 /* Disable device remote wakeup when host is suspended
1210 * For Realtek chips, global suspend without 1209 * For Realtek chips, global suspend without
@@ -1281,7 +1280,6 @@ static int btusb_close(struct hci_dev *hdev)
1281 if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags)) 1280 if (test_bit(BTUSB_WAKEUP_DISABLE, &data->flags))
1282 data->intf->needs_remote_wakeup = 1; 1281 data->intf->needs_remote_wakeup = 1;
1283 1282
1284 device_wakeup_disable(&data->udev->dev);
1285 usb_autopm_put_interface(data->intf); 1283 usb_autopm_put_interface(data->intf);
1286 1284
1287failed: 1285failed: