From patchwork Fri Feb 16 16:05:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 128604 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp718196ljc; Fri, 16 Feb 2018 08:06:20 -0800 (PST) X-Google-Smtp-Source: AH8x227agJhNMLqGOtU80jB+0liGXDqkMokEvnMqyprdMIQt9oRGyzFQJtDFFs+A46vwFgm9BiG9 X-Received: by 10.98.178.218 with SMTP id z87mr6535127pfl.88.1518797180779; Fri, 16 Feb 2018 08:06:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518797180; cv=none; d=google.com; s=arc-20160816; b=ekuYSs4uT/T2fK3fBi6AIkDMb5UvEfDJqK5/Mr2nsbv0w4d3uM0xCFCU7uExQMP2Gz 3cdXtqkh7h5EmpMU3hoGmE49X/+SoNALA2XgfwZrx2vBwHZ7bWDRHcWDojmmHSqAykVz 3h1msbYoNL0soG71wmIkx3qomB0XcGIEZWzTvfFM/UheEHxDYUTqxPNVOhGoQTwzGciH XG8QE7zYxR7gaVsrGyhrBvhs/5+LzSOFdCbuAAjawbNm93cv3H1TBvBo7iNiji5YfTuX G9ggp/RTORpMJ9jtA/HpBHH3yTW0uXbF6vwcLtucs8BdsEhpQ5Gmq57B9Nxd0wE915qh JgIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=taxLW7Yx71qsBdiMC8ahUYY8opuWW3jJ2UafcSH7efE=; b=gg/YJrjlIVdz4PHU4CWl9+7pfmJDQyhl6rEprdFkF7a4iSw5gBnwdZG2hLs/CsyMUT D2PTOxjKNikfzd7TgYjz9DHFnrf5cMvqrmW4BUkxtsWSBymJJMX/oPZolrpCStKzue8s KTORAnJiTpf7Jmn1eW248on3ze+VtxCHLF6U+3wjUEzo9hiQ9EJX/7PmWwIvXeP6ip6u rf848fs1E4+72+kyqOEHuCqacCbdP2+kI+hF1Y6Aw6b0rpVlsuC2vF7HT0IDSp49aPHG O6ObHh80iLdfePXAm4sxARWiQYmI0hRATw9LXsSwMsun0CS726uUS50SvneOfuX5G0Y/ EaCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b2si1442281pgc.726.2018.02.16.08.06.20; Fri, 16 Feb 2018 08:06:20 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753000AbeBPQGS (ORCPT + 10 others); Fri, 16 Feb 2018 11:06:18 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:34937 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752932AbeBPQGR (ORCPT ); Fri, 16 Feb 2018 11:06:17 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lr4bL-1eHFap3Axv-00eeJB; Fri, 16 Feb 2018 17:06:04 +0100 From: Arnd Bergmann To: stable@vger.kernel.org Cc: Arnd Bergmann , Marcel Holtmann , Gustavo Padovan , Johan Hedberg , Sebastian Reichel , "David S. Miller" , Tobias Regnery , Greg Kroah-Hartman , Javier Martinez Canillas , Bjorn Andersson , linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [4.14 only backport] Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS Date: Fri, 16 Feb 2018 17:05:35 +0100 Message-Id: <20180216160556.1634805-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:oS85TbQgBSE1cnm5h+VkdE8M6sgsOp2DD98NKXRkAsphTvg789j E9Mr5oQ/5ABK3doJv+dLCqGAMjiRqbCxO0cgTuWRRfDl8zwvpGZY3aq3EEShIftTCpK+coO HA5ohQOifxfxR1bcxxj6Uguiwl4rrgWcNk/Qv4TcTuC5kNiANhOtRcGbNwzP6zt5YNchbR1 A7VFU8vRkUpg2YDTH62wA== X-UI-Out-Filterresults: notjunk:1; V01:K0:3xWgtkG3LVc=:NtPGYXF7mJtDk9HqHMDs1Z EuM8ycn505gJfT4R5ftJY3ub/f6NUzPD98dDh9nu8z6bOKRWPL/a7NqNDWiEAqOcepHf5cIKj OVEbS3wH3spm36Frf9n48esZ8YL10qZc18mP93jrgEfD4gJCPBm2aXO3v5DKW/IsZjrspPovc ze0ehcNgbLT63vc/WWeCuuIazRUEEGD94Z2XFwzhxxiTOiGHrNkDyfPRk0lCf+s2ftQnr2Lz4 AxzIo7KjXseJ3g+RhVFUcVlWl6v9iitxZCocb3gbaOIKpaqch8sSbV/t2kyaf2BhZWanlVur1 ScKlhfQ3wIQe+Yayy157JsD3RVYzyrp2aOb0600p8vDX/Ksr6szUtU0o2/eeUExXTWrd45Qkm ehFA4amO0fHOUr2NQYj4mtTf4sehzdhGaI2tR+UiEc0CzI29zMZIdJU19W8RRz1v2pFkJbVFp 1y5mxuUXkzUdkHnCpTqr7LXQyLcGsMyXc6zbBnYmxZXw0sznPubpgx5hnhMqLYQ9ZLVva9wFv 88mSElBfuZY5aOkhfws6Q8r5+Wxyg4DQF/cIbqFujaGwJ5tqF1R7fUldg3lHQiV89sAAEKFyc Cn2uCghusBfvUMwoOVf9bwxH9iw+he6hLoUV2ItGUl0QX4+ygWli/Exc6yj9c38mFqyl/SzbM 8fFJKHaWT11yccJNJUovh7/kkGGqquuz1F8fEuEM6L9Ia7rxuC7C2rlCdFKHKEMu6IfJGiwnA VgjiGEsnQrRyq2SxN2x33n2awBYLqA05p9eQ3g== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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") Signed-off-by: Arnd Bergmann Signed-off-by: Marcel Holtmann Cc: stable@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/bluetooth/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index 98a60db8e5d1..b33c8d6eb8c7 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -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