1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 461c68bc4dd7..c9463af8e564 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -143,6 +143,9 @@ static struct usb_device_id blacklist_table[] = {
         /* Atheros AR5BBU12 with sflash firmware */
         { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
 
+        /* Atheros AR5BBU12 with sflash firmware */
+        { USB_DEVICE(0x0489, 0xe03c), .driver_info = BTUSB_ATH3012 },
+
         /* Broadcom BCM2035 */
         { USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
         { USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -855,6 +858,7 @@ static void btusb_work(struct work_struct *work)
 {
         struct btusb_data *data = container_of(work, struct btusb_data, work);
         struct hci_dev *hdev = data->hdev;
+        int new_alts;
         int err;
 
         if (hdev->conn_hash.sco_num > 0) {
@@ -868,11 +872,19 @@ static void btusb_work(struct work_struct *work)
 
                         set_bit(BTUSB_DID_ISO_RESUME, &data->flags);
                 }
-                if (data->isoc_altsetting != 2) {
+
+                if (hdev->voice_setting & 0x0020) {
+                        static const int alts[3] = { 2, 4, 5 };
+                        new_alts = alts[hdev->conn_hash.sco_num - 1];
+                } else {
+                        new_alts = hdev->conn_hash.sco_num;
+                }
+
+                if (data->isoc_altsetting != new_alts) {
                         clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
                         usb_kill_anchored_urbs(&data->isoc_anchor);
 
-                        if (__set_isoc_interface(hdev, 2) < 0)
+                        if (__set_isoc_interface(hdev, new_alts) < 0)
                                 return;
                 }