]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
i2c: cadence: add IRQ check
authorSergey Shtylyov <s.shtylyov@omprussia.ru>
Sat, 10 Apr 2021 20:14:35 +0000 (23:14 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 07:44:29 +0000 (09:44 +0200)
[ Upstream commit 5581c2c5d02bc63a0edb53e061c8e97cd490646e ]

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 invalid
IRQ #s.

Fixes: df8eb5691c48 ("i2c: Add driver for Cadence I2C controller")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omprussia.ru>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/i2c/busses/i2c-cadence.c

index a51d3b7957701da20bac2cc91e347ff3e7f4b5f5..17f0dd1f891e2ddacecedf674882e3af10f49029 100644 (file)
@@ -901,7 +901,10 @@ static int cdns_i2c_probe(struct platform_device *pdev)
        if (IS_ERR(id->membase))
                return PTR_ERR(id->membase);
 
-       id->irq = platform_get_irq(pdev, 0);
+       ret = platform_get_irq(pdev, 0);
+       if (ret < 0)
+               return ret;
+       id->irq = ret;
 
        id->adap.owner = THIS_MODULE;
        id->adap.dev.of_node = pdev->dev.of_node;