diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-03-17 20:54:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-17 20:54:37 -0700 |
| commit | d36963b861c1ca352810cec2497e3dabf2333e11 (patch) | |
| tree | b3ca4ed82f5861dd1743168dc2af097a3d9c24b7 | |
| parent | net: ip_gre: Accept IFLA_INFO_DATA-less configuration (diff) | |
| parent | net: mvmdio: avoid error message for optional IRQ (diff) | |
| download | wireguard-linux-d36963b861c1ca352810cec2497e3dabf2333e11.tar.xz wireguard-linux-d36963b861c1ca352810cec2497e3dabf2333e11.zip | |
Merge branch 'net-mvmdio-avoid-error-message-for-optional-IRQ'
Chris Packham says:
====================
net: mvmdio: avoid error message for optional IRQ
I've gone ahead an sent a revert. This is the same as the original v1 except
I've added Andrew's review to the commit message.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/marvell/mvmdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index d2e2dc538428..d14762d93640 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -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; } |