Merge tag 'hsi-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[karo-tx-linux.git] / drivers / of / of_mdio.c

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index c0a8f84d92db628abe1910b7e3fe0215997e24ef..86829f8064a61eb324a0a9ea28f63f0bf3ceadbd 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -62,11 +62,9 @@ static int of_mdiobus_register_phy(struct mii_bus *mdio, struct device_node *chi
        rc = irq_of_parse_and_map(child, 0);
        if (rc > 0) {
                phy->irq = rc;
-               if (mdio->irq)
-                       mdio->irq[addr] = rc;
+               mdio->irq[addr] = rc;
        } else {
-               if (mdio->irq)
-                       phy->irq = mdio->irq[addr];
+               phy->irq = mdio->irq[addr];
        }
 
        if (of_property_read_bool(child, "broken-turn-around"))