summaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorSergey Shtylyov <s.shtylyov@omprussia.ru>2021-04-10 23:25:10 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-05-22 10:59:36 +0200
commitb469f21b20ac7b517d9e52dac7a52ec3e12ef715 (patch)
tree78900c4f2751c69e44698989c5f9e4f13db3ee1d /drivers/i2c/busses
parent06f09e43374d4a8f9743661c11a27983b0063c34 (diff)
downloadlinux-stable-b469f21b20ac7b517d9e52dac7a52ec3e12ef715.tar.gz
linux-stable-b469f21b20ac7b517d9e52dac7a52ec3e12ef715.tar.bz2
linux-stable-b469f21b20ac7b517d9e52dac7a52ec3e12ef715.zip
i2c: sh7760: add IRQ check
[ Upstream commit e5b2e3e742015dd2aa6bc7bcef2cb59b2de1221c ] 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: a26c20b1fa6d ("i2c: Renesas SH7760 I2C master driver") 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>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-sh7760.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c
index c2005c789d2b..c79c9f542c5a 100644
--- a/drivers/i2c/busses/i2c-sh7760.c
+++ b/drivers/i2c/busses/i2c-sh7760.c
@@ -471,7 +471,10 @@ static int sh7760_i2c_probe(struct platform_device *pdev)
goto out2;
}
- id->irq = platform_get_irq(pdev, 0);
+ ret = platform_get_irq(pdev, 0);
+ if (ret < 0)
+ return ret;
+ id->irq = ret;
id->adap.nr = pdev->id;
id->adap.algo = &sh7760_i2c_algo;