[PATCH 2/3] Input - soc_button_array: bail out earlier if gpiod_count is null
flat view
STALE3806d
From: Benjamin Tissoires <hidden>
Date: 2016-05-10 15:38:06
Also in:
lkml
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
The PNP0C40 device of the Surface 3 doesn't have any GPIO attached to it. Instead of trying to access the GPIO, request the count beforehand and bail out if it is null or if an error is returned. Signed-off-by: Benjamin Tissoires <redacted> --- drivers/input/misc/soc_button_array.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c
index 9cbe874..70002a3 100644
--- a/drivers/input/misc/soc_button_array.c
+++ b/drivers/input/misc/soc_button_array.c@@ -165,6 +165,11 @@ static int soc_button_probe(struct platform_device *pdev) if (!id) return -ENODEV; + if (gpiod_count(&pdev->dev, KBUILD_MODNAME) <= 0) { + dev_info(&pdev->dev, "no GPIO attached, ignoring...\n"); + return -ENODEV; + } + button_info = (struct soc_button_info *)id->driver_data; priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
--
2.5.0