net: of_mdio: do not overwrite PHY interrupt configuration
If irq_of_parse_and_map fails to find an interrupt line for a given PHY,
we will force the PHY interrupt to be PHY_POLL, completely overriding
the previous value that the MDIO bus may have set for us (e.g:
PHY_IGNORE_INTERRUPT). In case of failure, just restore the previous
value.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index f93ebca..14feffc 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -27,7 +27,7 @@
{
struct phy_device *phy;
bool is_c45;
- int rc;
+ int rc, prev_irq;
is_c45 = of_device_is_compatible(child,
"ethernet-phy-ieee802.3-c45");
@@ -37,10 +37,11 @@
return 1;
if (mdio->irq) {
+ prev_irq = mdio->irq[addr];
mdio->irq[addr] =
irq_of_parse_and_map(child, 0);
if (!mdio->irq[addr])
- mdio->irq[addr] = PHY_POLL;
+ mdio->irq[addr] = prev_irq;
}
/* Associate the OF node with the device structure so it