Commit d36963b8 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 32ca98fe fa2632f7
...@@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev) ...@@ -364,8 +364,8 @@ static int orion_mdio_probe(struct platform_device *pdev)
writel(MVMDIO_ERR_INT_SMI_DONE, writel(MVMDIO_ERR_INT_SMI_DONE,
dev->regs + MVMDIO_ERR_INT_MASK); dev->regs + MVMDIO_ERR_INT_MASK);
} else if (dev->err_interrupt < 0) { } else if (dev->err_interrupt == -EPROBE_DEFER) {
ret = dev->err_interrupt; ret = -EPROBE_DEFER;
goto out_mdio; goto out_mdio;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment