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

Commit 906a039d 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-08-01

Here's our first batch of Bluetooth patches for the 4.14 kernel:

 - Several new USB IDs for the btusb driver
 - Memory leak fix in btusb driver
 - Cleanups & fixes to hci_nokia, hci_serdev and hci_bcm drivers
 - Fixed cleanup path in mrf24j40 (802.15.4) driver probe function
 - A few other smaller cleanups & fixes to drivers

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c613c209 d829b9e2

drivers/bluetooth/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -98,6 +98,7 @@ config BT_HCIUART_NOKIA 
	depends on BT_HCIUART_SERDEV

	depends on BT_HCIUART_SERDEV

	depends on PM

	depends on PM

	select BT_HCIUART_H4

	select BT_HCIUART_H4

	select BT_BCM

	help

	help

	  Nokia H4+ is serial protocol for communication between Bluetooth

	  Nokia H4+ is serial protocol for communication between Bluetooth

	  device and host. This protocol is required for Bluetooth devices

	  device and host. This protocol is required for Bluetooth devices

drivers/bluetooth/ath3k.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -140,7 +140,8 @@ MODULE_DEVICE_TABLE(usb, ath3k_table); 




#define BTUSB_ATH3012		0x80

#define BTUSB_ATH3012		0x80

/* This table is to load patch and sysconfig files

/* This table is to load patch and sysconfig files

 * for AR3012 */

 * for AR3012

 */

static const struct usb_device_id ath3k_blist_tbl[] = {

static const struct usb_device_id ath3k_blist_tbl[] = {





	/* Atheros AR3012 with sflash firmware*/

	/* Atheros AR3012 with sflash firmware*/

drivers/bluetooth/bt3c_cs.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -684,14 +684,16 @@ static int bt3c_config(struct pcmcia_device *link) 
	unsigned long try;

	unsigned long try;





	/* First pass: look for a config entry that looks normal.

	/* First pass: look for a config entry that looks normal.

	   Two tries: without IO aliases, then with aliases */

	 * Two tries: without IO aliases, then with aliases

	 */

	for (try = 0; try < 2; try++)

	for (try = 0; try < 2; try++)

		if (!pcmcia_loop_config(link, bt3c_check_config, (void *) try))

		if (!pcmcia_loop_config(link, bt3c_check_config, (void *) try))

			goto found_port;

			goto found_port;





	/* Second pass: try to find an entry that isn't picky about

	/* Second pass: try to find an entry that isn't picky about

	   its base address, then try to grab any standard serial port

	 * its base address, then try to grab any standard serial port

	   address, and finally try to get any free port. */

	 * address, and finally try to get any free port.

	 */

	if (!pcmcia_loop_config(link, bt3c_check_config_notpicky, NULL))

	if (!pcmcia_loop_config(link, bt3c_check_config_notpicky, NULL))

		goto found_port;

		goto found_port;

drivers/bluetooth/btmrvl_sdio.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -1455,7 +1455,8 @@ static void btmrvl_sdio_dump_firmware(struct btmrvl_private *priv) 
	fw_dump_ptr = fw_dump_data;

	fw_dump_ptr = fw_dump_data;





	/* Dump all the memory data into single file, a userspace script will

	/* Dump all the memory data into single file, a userspace script will

	   be used to split all the memory data to multiple files*/

	 * be used to split all the memory data to multiple files

	 */

	BT_INFO("== btmrvl firmware dump to /sys/class/devcoredump start");

	BT_INFO("== btmrvl firmware dump to /sys/class/devcoredump start");

	for (idx = 0; idx < dump_num; idx++) {

	for (idx = 0; idx < dump_num; idx++) {

		struct memory_type_mapping *entry = &mem_type_mapping_tbl[idx];

		struct memory_type_mapping *entry = &mem_type_mapping_tbl[idx];
@@ -1482,7 +1483,8 @@ static void btmrvl_sdio_dump_firmware(struct btmrvl_private *priv) 
	}

	}





	/* fw_dump_data will be free in device coredump release function

	/* fw_dump_data will be free in device coredump release function

	   after 5 min*/

	 * after 5 min

	 */

	dev_coredumpv(&card->func->dev, fw_dump_data, fw_dump_len, GFP_KERNEL);

	dev_coredumpv(&card->func->dev, fw_dump_data, fw_dump_len, GFP_KERNEL);

	BT_INFO("== btmrvl firmware dump to /sys/class/devcoredump end");

	BT_INFO("== btmrvl firmware dump to /sys/class/devcoredump end");

}

}

drivers/bluetooth/btrtl.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -279,6 +279,8 @@ static int rtl_load_config(struct hci_dev *hdev, const char *name, u8 **buff) 
		return ret;

		return ret;

	ret = fw->size;

	ret = fw->size;

	*buff = kmemdup(fw->data, ret, GFP_KERNEL);

	*buff = kmemdup(fw->data, ret, GFP_KERNEL);

	if (!*buff)

		ret = -ENOMEM;





	release_firmware(fw);

	release_firmware(fw);