Commit 464b57da authored by Kenth Eriksson's avatar Kenth Eriksson Committed by David S. Miller

Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.

The merge done in commit b26e478f undid bug fix in commit c3e072f8
("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non
TBI (e.g. MDIO) PHYs cannot be accessed.
Signed-off-by: default avatarKenth Eriksson <kenth.eriksson@transmode.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67378563
...@@ -356,13 +356,13 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) ...@@ -356,13 +356,13 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev)
if (prop) if (prop)
tbiaddr = *prop; tbiaddr = *prop;
}
if (tbiaddr == -1) { if (tbiaddr == -1) {
err = -EBUSY; err = -EBUSY;
goto err_free_irqs; goto err_free_irqs;
} else { } else {
out_be32(tbipa, tbiaddr); out_be32(tbipa, tbiaddr);
}
} }
err = of_mdiobus_register(new_bus, np); err = of_mdiobus_register(new_bus, np);
......
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