Hi,
On Tue, Dec 25, 2018 at 07:51:29PM -0600, Kangjie Lu wrote:
> 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
> ---
> 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(>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;
What makes you think that not matching on this compatible is an error?
Have you looked at the rest of the dirver?
> + keypad->type = error;
> + }
> else
> keypad->type = platform_get_device_id(pdev)->driver_data;
>
> --
> 2.17.2 (Apple Git-113)
>
--
Dmitry
