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

Commit ad0cb27c 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 2017-04-22

Here are some more Bluetooth patches (and one 802.15.4 patch) in the
bluetooth-next tree targeting the 4.12 kernel. Most of them are pure
fixes.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 11a9ec43 d160b74d

drivers/bluetooth/Kconfig

+7 −1
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ config BT_HCIUART 
	  Say Y here to compile support for Bluetooth UART devices into the

	  kernel or say M to compile it as module (hci_uart).



config BT_HCIUART_SERDEV

	bool

	depends on SERIAL_DEV_BUS && BT_HCIUART

	depends on SERIAL_DEV_BUS=y || SERIAL_DEV_BUS=BT_HCIUART

	default y



config BT_HCIUART_H4

	bool "UART (H4) protocol support"

	depends on BT_HCIUART
@@ -89,7 +95,7 @@ config BT_HCIUART_H4 
config BT_HCIUART_NOKIA

	tristate "UART Nokia H4+ protocol support"

	depends on BT_HCIUART

	depends on SERIAL_DEV_BUS

	depends on BT_HCIUART_SERDEV

	depends on PM

	help

	  Nokia H4+ is serial protocol for communication between Bluetooth

drivers/bluetooth/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ btmrvl-y := btmrvl_main.o 
btmrvl-$(CONFIG_DEBUG_FS)	+= btmrvl_debugfs.o



hci_uart-y				:= hci_ldisc.o

hci_uart-$(CONFIG_SERIAL_DEV_BUS)	+= hci_serdev.o

hci_uart-$(CONFIG_BT_HCIUART_SERDEV)	+= hci_serdev.o

hci_uart-$(CONFIG_BT_HCIUART_H4)	+= hci_h4.o

hci_uart-$(CONFIG_BT_HCIUART_BCSP)	+= hci_bcsp.o

hci_uart-$(CONFIG_BT_HCIUART_LL)	+= hci_ll.o

drivers/bluetooth/hci_ldisc.c

+6 −1
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static void hci_uart_init_work(struct work_struct *work) 
{

	struct hci_uart *hu = container_of(work, struct hci_uart, init_ready);

	int err;

	struct hci_dev *hdev;



	if (!test_and_clear_bit(HCI_UART_INIT_PENDING, &hu->hdev_flags))

		return;
@@ -184,9 +185,12 @@ static void hci_uart_init_work(struct work_struct *work) 
	err = hci_register_dev(hu->hdev);

	if (err < 0) {

		BT_ERR("Can't register HCI device");

		hci_free_dev(hu->hdev);

		hdev = hu->hdev;

		hu->hdev = NULL;

		hci_free_dev(hdev);

		clear_bit(HCI_UART_PROTO_READY, &hu->flags);

		hu->proto->close(hu);

		return;

	}



	set_bit(HCI_UART_REGISTERED, &hu->flags);
@@ -602,6 +606,7 @@ static int hci_uart_register_dev(struct hci_uart *hu) 


	if (hci_register_dev(hdev) < 0) {

		BT_ERR("Can't register HCI device");

		hu->hdev = NULL;

		hci_free_dev(hdev);

		return -ENODEV;

	}

drivers/bluetooth/hci_ll.c

+1 −2
Original line number Diff line number Diff line
@@ -537,8 +537,7 @@ static int read_local_version(struct hci_dev *hdev) 
	if (IS_ERR(skb)) {

		bt_dev_err(hdev, "Reading TI version information failed (%ld)",

			   PTR_ERR(skb));

		err = PTR_ERR(skb);

		goto out;

		return PTR_ERR(skb);

	}

	if (skb->len != sizeof(*ver)) {

		err = -EILSEQ;

drivers/net/ieee802154/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ config IEEE802154_ADF7242 
config IEEE802154_CA8210

	tristate "Cascoda CA8210 transceiver driver"

	depends on IEEE802154_DRIVERS && MAC802154

	depends on COMMON_CLK

	depends on SPI

	select COMMON_CLK

	---help---

	  Say Y here to enable the CA8210 SPI 802.15.4 wireless

	  controller.