Commit a1299505 authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Wolfram Sang
Browse files

i2c: iop3xx: fix deferred probing 



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: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 8d744da2

drivers/i2c/busses/i2c-iop3xx.c

+2 −4
Original line number Diff line number Diff line
@@ -469,16 +469,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;