[PATCH] keyboard: (samsung) fix a missing check of return value
flat view
STALE2843d
From: Kangjie Lu <hidden>
Date: 2018-12-26 01:52:02
Also in:
lkml
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
of_device_is_compatible() returns false if the device is incompatible. The fix adds a check for its return value; Signed-off-by: Kangjie Lu <redacted> --- drivers/input/keyboard/samsung-keypad.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index 1fe1aa2adf85..5ba940f3f76e 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c@@ -387,9 +387,13 @@ static int samsung_keypad_probe(struct platform_device *pdev) keypad->stopped = true; init_waitqueue_head(&keypad->wait); - if (pdev->dev.of_node) - keypad->type = of_device_is_compatible(pdev->dev.of_node, - "samsung,s5pv210-keypad"); + if (pdev->dev.of_node) { + error = of_device_is_compatible(pdev->dev.of_node, + "samsung,s5pv210-keypad"); + if (!error) + return -EINVAL; + keypad->type = error; + } else keypad->type = platform_get_device_id(pdev)->driver_data;
--
2.17.2 (Apple Git-113)