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.8 472/633] Input: sun4i-ps2 - fix handling of platform_get_irq() error
    Date
    From: Krzysztof Kozlowski <krzk@kernel.org>

    [ Upstream commit cafb3abea6136e59ea534004e5773361e196bb94 ]

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

    Fixes: e443631d20f5 ("Input: serio - add support for Alwinner A10/A20 PS/2 controller")
    Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
    Acked-by: Chen-Yu Tsai <wens@csie.org>
    Link: https://lore.kernel.org/r/20200828145744.3636-4-krzk@kernel.org
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/serio/sun4i-ps2.c | 9 +++------
    1 file changed, 3 insertions(+), 6 deletions(-)

    diff --git a/drivers/input/serio/sun4i-ps2.c b/drivers/input/serio/sun4i-ps2.c
    index a681a2c04e399..f15ed3dcdb9b2 100644
    --- a/drivers/input/serio/sun4i-ps2.c
    +++ b/drivers/input/serio/sun4i-ps2.c
    @@ -211,7 +211,6 @@ static int sun4i_ps2_probe(struct platform_device *pdev)
    struct sun4i_ps2data *drvdata;
    struct serio *serio;
    struct device *dev = &pdev->dev;
    - unsigned int irq;
    int error;

    drvdata = kzalloc(sizeof(struct sun4i_ps2data), GFP_KERNEL);
    @@ -264,14 +263,12 @@ static int sun4i_ps2_probe(struct platform_device *pdev)
    writel(0, drvdata->reg_base + PS2_REG_GCTL);

    /* Get IRQ for the device */
    - irq = platform_get_irq(pdev, 0);
    - if (!irq) {
    - dev_err(dev, "no IRQ found\n");
    - error = -ENXIO;
    + drvdata->irq = platform_get_irq(pdev, 0);
    + if (drvdata->irq < 0) {
    + error = drvdata->irq;
    goto err_disable_clk;
    }

    - drvdata->irq = irq;
    drvdata->serio = serio;
    drvdata->dev = dev;

    --
    2.25.1


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