linux-kernel - [PATCH 2/5] input: misc: bma150: Conditionally disable bma023 support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sun,  3 May 2020 10:22:03 -0700
From:   Jonathan Bakker <xc-racer2@...e.ca>
To:     jic23@...nel.org, knaack.h@....de, lars@...afoo.de,
        pmeerw@...erw.net, robh+dt@...nel.org, linus.walleij@...aro.org,
        linux-iio@...r.kernel.org, devicetree@...r.kernel.org,
        linux-kernel@...r.kernel.org, dmitry.torokhov@...il.com,
        kstewart@...uxfoundation.org, gregkh@...uxfoundation.org,
        tglx@...utronix.de, linux-input@...r.kernel.org
Cc:     Jonathan Bakker <xc-racer2@...e.ca>
Subject: [PATCH 2/5] input: misc: bma150: Conditionally disable bma023 support

The bma180 IIO driver has been extended for support for bma023.
However, this could cause conflicts with this driver.  Since some
setups may depend upon the evdev setup, disable support in this
driver for the bma023 only when the IIO driver is being built.

Signed-off-by: Jonathan Bakker <xc-racer2@...e.ca>
---
 drivers/input/misc/bma150.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/input/misc/bma150.c b/drivers/input/misc/bma150.c
index a9d984da95f3..5d3f8b05b316 100644
--- a/drivers/input/misc/bma150.c
+++ b/drivers/input/misc/bma150.c
@@ -541,7 +541,10 @@ static UNIVERSAL_DEV_PM_OPS(bma150_pm, bma150_suspend, bma150_resume, NULL);
 static const struct i2c_device_id bma150_id[] = {
 	{ "bma150", 0 },
 	{ "smb380", 0 },
+	/* Prefer the IIO-based driver for bma023 if enabled */
+#if !IS_ENABLED(CONFIG_BMA180)
 	{ "bma023", 0 },
+#endif
 	{ }
 };
 
-- 
2.20.1