Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 791ef39c authored by John W. Linville's avatar John W. Linville
Browse files

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

parents e5a87625 0c1abbd1

drivers/bluetooth/bluecard_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -681,7 +681,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb) 
	case HCI_SCODATA_PKT:

		hdev->stat.sco_tx++;

		break;

	};

	}



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

drivers/bluetooth/btmrvl_sdio.c

+1 −2
Original line number Diff line number Diff line
@@ -600,7 +600,6 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) 
exit:

	if (ret) {

		hdev->stat.err_rx++;

		if (skb)

		kfree_skb(skb);

	}

drivers/bluetooth/btuart_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb) 
	case HCI_SCODATA_PKT:

		hdev->stat.sco_tx++;

		break;

	};

	}



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

drivers/bluetooth/btusb.c

+2 −1
Original line number Diff line number Diff line
@@ -96,11 +96,12 @@ static struct usb_device_id btusb_table[] = { 
	{ USB_DEVICE(0x0c10, 0x0000) },



	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x04ca, 0x2003) },

	{ USB_DEVICE(0x0489, 0xe042) },

	{ USB_DEVICE(0x413c, 0x8197) },



	/* Foxconn - Hon Hai */

	{ USB_DEVICE(0x0489, 0xe033) },

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0489, 0xff, 0x01, 0x01) },



	/*Broadcom devices with vendor specific id */

	{ USB_VENDOR_AND_INTERFACE_INFO(0x0a5c, 0xff, 0x01, 0x01) },

drivers/bluetooth/btwilink.c

+1 −15
Original line number Diff line number Diff line
@@ -358,21 +358,7 @@ static struct platform_driver btwilink_driver = { 
	},

};



/* ------- Module Init/Exit interfaces ------ */

static int __init btwilink_init(void)

{

	BT_INFO("Bluetooth Driver for TI WiLink - Version %s", VERSION);



	return platform_driver_register(&btwilink_driver);

}



static void __exit btwilink_exit(void)

{

	platform_driver_unregister(&btwilink_driver);

}



module_init(btwilink_init);

module_exit(btwilink_exit);

module_platform_driver(btwilink_driver);



/* ------ Module Info ------ */