| From 7cd10cc018cba13963b05f59842eb9d9a49d1832 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 10 Apr 2021 23:23:33 +0300 |
| Subject: i2c: rcar: add IRQ check |
| |
| 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 |
| |
