lkml.org 
[lkml]   [2018]   [Dec]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] keyboard: (samsung) fix a missing check of return value
Date
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 <kjlu@umn.edu>
---
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)
\
 
 \ /
  Last update: 2018-12-26 02:52    [W:0.035 / U:0.100 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site