| From 08da3401162ebe856a8d064ccab1a85455e395e1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 10 Apr 2021 23:14:35 +0300 |
| Subject: i2c: cadence: add IRQ check |
| |
| From: Sergey Shtylyov <s.shtylyov@omprussia.ru> |
| |
| [ 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 | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c |
| index e8eae8725900..c1bbc4caeb5c 100644 |
| --- a/drivers/i2c/busses/i2c-cadence.c |
| +++ b/drivers/i2c/busses/i2c-cadence.c |
| @@ -1200,7 +1200,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; |
| -- |
| 2.30.2 |
| |
