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

Commit 7b22a778 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

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



Johan Hedberg says:

====================
pull request: bluetooth-next 2015-12-31

Here's (probably) the last bluetooth-next pull request for the 4.5
kernel:

 - Add support for BCM2E65 ACPI ID
 - Minor fixes/cleanups in the bcm203x & bfusb drivers
 - Minor debugfs related fix in 6lowpan code

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ccac0425 7ddb6922

drivers/bluetooth/bcm203x.c

+1 −3
Original line number Diff line number Diff line
@@ -178,10 +178,8 @@ static int bcm203x_probe(struct usb_interface *intf, const struct usb_device_id 
		return -ENODEV;



	data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);

	if (!data) {

		BT_ERR("Can't allocate memory for data structure");

	if (!data)

		return -ENOMEM;

	}



	data->udev  = udev;

	data->state = BCM203X_LOAD_MINIDRV;

drivers/bluetooth/bfusb.c

+2 −4
Original line number Diff line number Diff line
@@ -636,10 +636,8 @@ static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i 


	/* Initialize control structure and load firmware */

	data = devm_kzalloc(&intf->dev, sizeof(struct bfusb_data), GFP_KERNEL);

	if (!data) {

		BT_ERR("Can't allocate memory for control structure");

		goto done;

	}

	if (!data)

		return -ENOMEM;



	data->udev = udev;

	data->bulk_in_ep    = bulk_in_ep->desc.bEndpointAddress;

drivers/bluetooth/hci_bcm.c

+1 −0
Original line number Diff line number Diff line
@@ -815,6 +815,7 @@ static const struct hci_uart_proto bcm_proto = { 
#ifdef CONFIG_ACPI

static const struct acpi_device_id bcm_acpi_match[] = {

	{ "BCM2E39", 0 },

	{ "BCM2E65", 0 },

	{ "BCM2E67", 0 },

	{ },

};

net/6lowpan/core.c

+3 −3
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ int lowpan_register_netdevice(struct net_device *dev, 


	lowpan_priv(dev)->lltype = lltype;



	ret = lowpan_dev_debugfs_init(dev);

	ret = register_netdevice(dev);

	if (ret < 0)

		return ret;



	ret = register_netdevice(dev);

	ret = lowpan_dev_debugfs_init(dev);

	if (ret < 0)

		lowpan_dev_debugfs_exit(dev);

		unregister_netdevice(dev);



	return ret;

}

net/bluetooth/af_bluetooth.c

+6 −6
Original line number Diff line number Diff line
@@ -174,13 +174,13 @@ EXPORT_SYMBOL(bt_accept_unlink); 


struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock)

{

	struct list_head *p, *n;

	struct bt_sock *s, *n;

	struct sock *sk;



	BT_DBG("parent %p", parent);



	list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {

		sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);

	list_for_each_entry_safe(s, n, &bt_sk(parent)->accept_q, accept_q) {

		sk = (struct sock *)s;



		lock_sock(sk);
@@ -388,11 +388,11 @@ EXPORT_SYMBOL(bt_sock_stream_recvmsg); 


static inline unsigned int bt_accept_poll(struct sock *parent)

{

	struct list_head *p, *n;

	struct bt_sock *s, *n;

	struct sock *sk;



	list_for_each_safe(p, n, &bt_sk(parent)->accept_q) {

		sk = (struct sock *) list_entry(p, struct bt_sock, accept_q);

	list_for_each_entry_safe(s, n, &bt_sk(parent)->accept_q, accept_q) {

		sk = (struct sock *)s;

		if (sk->sk_state == BT_CONNECTED ||

		    (test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags) &&

		     sk->sk_state == BT_CONNECT2))