Merge branch 'master' of... (1a63c353) · Commits · e / devices / android_kernel_fairphone_FP5

MAINTAINERS

+4 −1

Original line number	Diff line number	Diff line
		@@ -1358,16 +1358,19 @@ F: drivers/mtd/devices/block2mtd.c

		BLUETOOTH DRIVERS
		M: Marcel Holtmann <marcel@holtmann.org>
		M: Gustavo F. Padovan <padovan@profusion.mobi>
		L: linux-bluetooth@vger.kernel.org
		W: http://www.bluez.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
		S: Maintained
		F: drivers/bluetooth/

		BLUETOOTH SUBSYSTEM
		M: Marcel Holtmann <marcel@holtmann.org>
		M: Gustavo F. Padovan <padovan@profusion.mobi>
		L: linux-bluetooth@vger.kernel.org
		W: http://www.bluez.org/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
		S: Maintained
		F: net/bluetooth/
		F: include/net/bluetooth/

+2 −2

Original line number	Diff line number	Diff line
		@@ -117,8 +117,8 @@ int btmrvl_process_event(struct btmrvl_private priv, struct sk_buff skb)
		(event->data[2] == MODULE_ALREADY_UP)) ?
		"Bring-up succeed" : "Bring-up failed");

		if (event->length > 3)
		priv->btmrvl_dev.dev_type = event->data[3];
		if (event->length > 3 && event->data[3])
		priv->btmrvl_dev.dev_type = HCI_AMP;
		else
		priv->btmrvl_dev.dev_type = HCI_BREDR;

+8 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,9 @@ static const struct sdio_device_id btsdio_table[] = {
		/* Generic Bluetooth Type-B SDIO device */
		{ SDIO_DEVICE_CLASS(SDIO_CLASS_BT_B) },

		/* Generic Bluetooth AMP controller */
		{ SDIO_DEVICE_CLASS(SDIO_CLASS_BT_AMP) },

		{ } /* Terminating entry */
		};

		@@ -329,6 +332,11 @@ static int btsdio_probe(struct sdio_func *func,
		hdev->bus = HCI_SDIO;
		hdev->driver_data = data;

		if (id->class == SDIO_CLASS_BT_AMP)
		hdev->dev_type = HCI_AMP;
		else
		hdev->dev_type = HCI_BREDR;

		data->hdev = hdev;

		SET_HCIDEV_DEV(hdev, &func->dev);

+6 −0

Original line number	Diff line number	Diff line
		@@ -59,9 +59,15 @@ static struct usb_device_id btusb_table[] = {
		/* Generic Bluetooth USB device */
		{ USB_DEVICE_INFO(0xe0, 0x01, 0x01) },

		/* Apple MacBookPro 7,1 */
		{ USB_DEVICE(0x05ac, 0x8213) },

		/* Apple iMac11,1 */
		{ USB_DEVICE(0x05ac, 0x8215) },

		/* Apple MacBookPro6,2 */
		{ USB_DEVICE(0x05ac, 0x8218) },

		/* AVM BlueFRITZ! USB v2.0 */
		{ USB_DEVICE(0x057c, 0x3800) },

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ static inline void hci_uart_tx_complete(struct hci_uart *hu, int pkt_type)
		break;

		case HCI_SCODATA_PKT:
		hdev->stat.cmd_tx++;
		hdev->stat.sco_tx++;
		break;
		}
		}