Commit e4491423 authored Aug 12, 2021 by Sergey Shtylyov Committed by Greg Kroah-Hartman Sep 22, 2021

i2c: iop3xx: fix deferred probing



[ Upstream commit a1299505162ad00def3573260c2c68b9c8e8d697 ]

When adding the code to handle platform_get_irq*() errors in the commit
48944738 ("handle errors returned by platform_get_irq*()"), the
actual error code was enforced to be -ENXIO in the driver for some
strange reason.  This didn't matter much until the deferred probing was
introduced -- which requires an actual error code to be propagated
upstream from the failure site.

While fixing this, also stop overriding the errors from request_irq() to
-EIO (done since the pre-git era).

Fixes: 48944738 ("[PATCH] handle errors returned by platform_get_irq*()")
Signed-off-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent c52204af

drivers/i2c/busses/i2c-iop3xx.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -456,16 +456,14 @@ iop3xx_i2c_probe(struct platform_device *pdev)

		irq = platform_get_irq(pdev, 0);
		if (irq < 0) {
		ret = -ENXIO;
		ret = irq;
		goto unmap;
		}
		ret = request_irq(irq, iop3xx_i2c_irq_handler, 0,
		pdev->name, adapter_data);

		if (ret) {
		ret = -EIO;
		if (ret)
		goto unmap;
		}

		memcpy(new_adapter->name, pdev->name, strlen(pdev->name));
		new_adapter->owner = THIS_MODULE;