Skip to contentSkip to conversation

Patch "Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Feb 21, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
bluetooth-bt_hciuart-now-depends-on-serial_dev_bus.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 05e89fb576f580ac95e7a5d00bdb34830b09671a Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Wed, 11 Oct 2017 15:47:54 +0200
Subject: Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS

From: Arnd Bergmann <[email protected]>

commit 05e89fb576f580ac95e7a5d00bdb34830b09671a upstream.

It is no longer possible to build BT_HCIUART into the kernel when SERIAL_DEV_BUS is a loadable module, even if none of the SERIAL_DEV_BUS based implementations are selected:

drivers/bluetooth/hci_ldisc.o: In function `hci_uart_set_flow_control':
hci_ldisc.c:(.text+0xb40): undefined reference to serdev_device_set_flow_control' hci_ldisc.c:(.text+0xb5c): undefined reference to serdev_device_set_tiocm'

This adds a dependency to avoid the broken configuration.

Fixes 7841d554809b ("Bluetooth: hci_uart_set_flow_control: Fix NULL deref when using serdev")
---
 drivers/bluetooth/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/Kconfig +1 -1
@@ -66,6 +66,7 @@ config BT_HCIBTSDIO
 
 config BT_HCIUART
 	tristate "HCI UART driver"
+	depends on SERIAL_DEV_BUS || !SERIAL_DEV_BUS
 	depends on TTY
 	help
 	  Bluetooth HCI UART driver.
@@ -80,7 +81,6 @@ config BT_HCIUART
 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

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/arm-spear600-add-missing-interrupt-parent-of-rtc.patch queue-4.14/media-r820t-fix-r820t_write_reg-for-kasan.patch queue-4.14/arm-dts-sti-add-gpio-polarity-for-hdmi-hpd-gpio-property.patch queue-4.14/kselftest-fix-oom-in-memory-compaction-test.patch queue-4.14/arm-spear13xx-fix-spics-gpio-controller-s-warning.patch queue-4.14/arm-dts-delete-bogus-reference-to-the-charlcd.patch queue-4.14/mm-hide-a-warning-for-compile_test.patch queue-4.14/tracing-prevent-profile_all_branches-when-fortify_source-y.patch queue-4.14/arm-pxa-tosa-bt-add-module_license-tag.patch queue-4.14/arm-lpc3250-fix-uda1380-gpio-numbers.patch queue-4.14/arm-dts-s5pv210-add-interrupt-parent-for-ohci.patch queue-4.14/bluetooth-bt_hciuart-now-depends-on-serial_dev_bus.patch queue-4.14/arm-spear13xx-fix-dmas-cells.patch queue-4.14/arm-dts-exynos-fix-rtc-interrupt-for-exynos5410.patch queue-4.14/arm-dts-nomadik-add-interrupt-parent-for-clcd.patch