lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 566/757] Input: omap4-keypad - fix handling of platform_get_irq() error
    Date
    From: Krzysztof Kozlowski <krzk@kernel.org>

    [ Upstream commit 4738dd1992fa13acfbbd71800c71c612f466fa44 ]

    platform_get_irq() returns -ERRNO on error. In such case comparison
    to 0 would pass the check.

    Fixes: f3a1ba60dbdb ("Input: omap4-keypad - use platform device helpers")
    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Link: https://lore.kernel.org/r/20200828145744.3636-2-krzk@kernel.org
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/keyboard/omap4-keypad.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
    index 94c94d7f5155f..d6c924032aaa8 100644
    --- a/drivers/input/keyboard/omap4-keypad.c
    +++ b/drivers/input/keyboard/omap4-keypad.c
    @@ -240,10 +240,8 @@ static int omap4_keypad_probe(struct platform_device *pdev)
    }

    irq = platform_get_irq(pdev, 0);
    - if (!irq) {
    - dev_err(&pdev->dev, "no keyboard irq assigned\n");
    - return -EINVAL;
    - }
    + if (irq < 0)
    + return irq;

    keypad_data = kzalloc(sizeof(struct omap4_keypad), GFP_KERNEL);
    if (!keypad_data) {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:39    [W:4.624 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site