Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

John W. Linville
2 parents 0f5cd45960 e9036e336a
Showing 3 changed files Side-by-side Diff
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c
net/bluetooth/rfcomm/tty.c
@@ -41,6 +41,9 @@
  
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03F0, 0x311D) },
+
+	/* Atheros AR5BBU12 with sflash firmware */
+	{ USB_DEVICE(0x0489, 0xE02C) },
 	{ }	/* Terminating entry */
 };
  
@@ -105,6 +105,9 @@
 	/* Atheros AR9285 Malbec with sflash firmware */
 	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
  
+	/* Atheros AR5BBU12 with sflash firmware */
+	{ USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
+
 	/* Broadcom BCM2035 */
 	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
 	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
@@ -829,7 +832,7 @@
  
 	if (hdev->conn_hash.sco_num > 0) {
 		if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {
-			err = usb_autopm_get_interface(data->isoc);
+			err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);
 			if (err < 0) {
 				clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
 				usb_kill_anchored_urbs(&data->isoc_anchor);
@@ -858,7 +861,7 @@
  
 		__set_isoc_interface(hdev, 0);
 		if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))
-			usb_autopm_put_interface(data->isoc);
+			usb_autopm_put_interface(data->isoc ? data->isoc : data->intf);
 	}
 }
  
@@ -727,7 +727,9 @@
 			break;
 		}
  
+		tty_unlock();
 		schedule();
+		tty_lock();
 	}
 	set_current_state(TASK_RUNNING);
 	remove_wait_queue(&dev->wait, &wait);
...	...	@@ -41,6 +41,9 @@
41	41
42	42	/* Atheros AR9285 Malbec with sflash firmware */
43	43	{ USB_DEVICE(0x03F0, 0x311D) },
	44	+
	45	+ /* Atheros AR5BBU12 with sflash firmware */
	46	+ { USB_DEVICE(0x0489, 0xE02C) },
44	47	{ } /* Terminating entry */
45	48	};
46	49
...	...	@@ -105,6 +105,9 @@
105	105	/* Atheros AR9285 Malbec with sflash firmware */
106	106	{ USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
107	107
	108	+ /* Atheros AR5BBU12 with sflash firmware */
	109	+ { USB_DEVICE(0x0489, 0xe02c), .driver_info = BTUSB_IGNORE },
	110	+
108	111	/* Broadcom BCM2035 */
109	112	{ USB_DEVICE(0x0a5c, 0x2035), .driver_info = BTUSB_WRONG_SCO_MTU },
110	113	{ USB_DEVICE(0x0a5c, 0x200a), .driver_info = BTUSB_WRONG_SCO_MTU },
...	...	@@ -829,7 +832,7 @@
829	832
830	833	if (hdev->conn_hash.sco_num > 0) {
831	834	if (!test_bit(BTUSB_DID_ISO_RESUME, &data->flags)) {
832		- err = usb_autopm_get_interface(data->isoc);
	835	+ err = usb_autopm_get_interface(data->isoc ? data->isoc : data->intf);
833	836	if (err < 0) {
834	837	clear_bit(BTUSB_ISOC_RUNNING, &data->flags);
835	838	usb_kill_anchored_urbs(&data->isoc_anchor);
...	...	@@ -858,7 +861,7 @@
858	861
859	862	__set_isoc_interface(hdev, 0);
860	863	if (test_and_clear_bit(BTUSB_DID_ISO_RESUME, &data->flags))
861		- usb_autopm_put_interface(data->isoc);
	864	+ usb_autopm_put_interface(data->isoc ? data->isoc : data->intf);
862	865	}
863	866	}
864	867
...	...	@@ -727,7 +727,9 @@
727	727	break;
728	728	}
729	729
	730	+ tty_unlock();
730	731	schedule();
	732	+ tty_lock();
731	733	}
732	734	set_current_state(TASK_RUNNING);
733	735	remove_wait_queue(&dev->wait, &wait);