lkml.org 
[lkml]   [2021]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 502/601] i2c: rcar: add IRQ check
    Date
    From: Sergey Shtylyov <s.shtylyov@omprussia.ru>

    [ Upstream commit 147178cf03a6dcb337e703d4dacd008683022a58 ]

    The driver neglects to check the result of platform_get_irq()'s call and
    blithely passes the negative error codes to devm_request_irq() (which
    takes *unsigned* IRQ #), causing it to fail with -EINVAL, overriding
    an original error code. Stop calling devm_request_irq() with the
    invalid IRQ #s.

    Fixes: 6ccbe607132b ("i2c: add Renesas R-Car I2C driver")
    Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
    Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/busses/i2c-rcar.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
    index 12f6d452c0f7..8722ca23f889 100644
    --- a/drivers/i2c/busses/i2c-rcar.c
    +++ b/drivers/i2c/busses/i2c-rcar.c
    @@ -1027,7 +1027,10 @@ static int rcar_i2c_probe(struct platform_device *pdev)
    if (of_property_read_bool(dev->of_node, "smbus"))
    priv->flags |= ID_P_HOST_NOTIFY;

    - priv->irq = platform_get_irq(pdev, 0);
    + ret = platform_get_irq(pdev, 0);
    + if (ret < 0)
    + goto out_pm_disable;
    + priv->irq = ret;
    ret = devm_request_irq(dev, priv->irq, irqhandler, irqflags, dev_name(dev), priv);
    if (ret < 0) {
    dev_err(dev, "cannot get irq %d\n", priv->irq);
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-05-12 20:02    [W:5.415 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site