Revert "net: mvmdio: avoid error message for optional IRQ" (028fd76b) · Commits · 戴 / test

This reverts commit . platform_get_irq_optional() will still return -ENXIO when no interrupt is provided so the additional error handling caused the driver prone to fail when no interrupt was specified. Revert the change so we can apply the correct minimal fix. Signed-off-by:

Chris Packham <chris.packham@alliedtelesis.co.nz> Reviewed-by:

Andrew Lunn <andrew@lunn.ch> Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/marvell/mvmdio.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ static int orion_mdio_probe(struct platform_device *pdev)
		}


		dev->err_interrupt = platform_get_irq_optional(pdev, 0);
		dev->err_interrupt = platform_get_irq(pdev, 0);
		if (dev->err_interrupt > 0 &&
		resource_size(r) < MVMDIO_ERR_INT_MASK + 4) {
		dev_err(&pdev->dev,
		@@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev)
		writel(MVMDIO_ERR_INT_SMI_DONE,
		dev->regs + MVMDIO_ERR_INT_MASK);

		} else if (dev->err_interrupt < 0) {
		ret = dev->err_interrupt;
		} else if (dev->err_interrupt == -EPROBE_DEFER) {
		ret = -EPROBE_DEFER;
		goto out_mdio;
		}

Admin message