Skip to content

Commit

Permalink
Merge branch 'net-mvmdio-avoid-error-message-for-optional-IRQ'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Mar 18, 2020
2 parents 32ca98f + fa2632f commit d36963b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/marvell/mvmdio.c
Original file line number Diff line number Diff line change
@@ -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;
}

0 comments on commit d36963b

Please sign in to comment.