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

Commit 0d092f06 authored by David S. Miller's avatar David S. Miller
Browse files

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



Johan Hedberg says:

====================
pull request: bluetooth 2018-08-23

Here are two important Bluetooth fixes for the MediaTek and RealTek HCI
drivers.

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6bfde2e1 addb3ffb

drivers/bluetooth/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ config BT_HCIUART_RTL 
	depends on BT_HCIUART

	depends on BT_HCIUART_SERDEV

	depends on GPIOLIB

	depends on ACPI

	select BT_HCIUART_3WIRE

	select BT_RTL

	help

drivers/bluetooth/btmtkuart.c

+5 −3
Original line number Diff line number Diff line
@@ -144,8 +144,10 @@ static int mtk_setup_fw(struct hci_dev *hdev) 
	fw_size = fw->size;



	/* The size of patch header is 30 bytes, should be skip */

	if (fw_size < 30)

		return -EINVAL;

	if (fw_size < 30) {

		err = -EINVAL;

		goto free_fw;

	}



	fw_size -= 30;

	fw_ptr += 30;
@@ -172,8 +174,8 @@ static int mtk_setup_fw(struct hci_dev *hdev) 
		fw_ptr += dlen;

	}



free_fw:

	release_firmware(fw);



	return err;

}