diff options
| author |   Chris Packham <chris.packham@alliedtelesis.co.nz> | 2020-03-16 20:49:06 +1300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-03-17 20:54:37 -0700 |
| commit | 028fd76b9b1cc9e195ce60790791fd3f37b9b5d7 (patch) | |
| tree | bf541a224df198fa600511f11b92f12626ca94d0 /drivers/net/ethernet/marvell/mvmdio.c | |
| parent | net: ip_gre: Accept IFLA_INFO_DATA-less configuration (diff) | |
| download | linux-dev-028fd76b9b1cc9e195ce60790791fd3f37b9b5d7.tar.xz linux-dev-028fd76b9b1cc9e195ce60790791fd3f37b9b5d7.zip | |
Revert "net: mvmdio: avoid error message for optional IRQ"
This reverts commit e1f550dc44a4d535da4e25ada1b0eaf8f3417929.
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>
Diffstat (limited to 'drivers/net/ethernet/marvell/mvmdio.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvmdio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index d2e2dc538428..0b9e851f3da4 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -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; } |