Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
The merge done in commitb26e478f
undid bug fix in commitc3e072f8
("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: Kenth Eriksson <kenth.eriksson@transmode.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
67378563df
commit
464b57da56
|
@ -356,7 +356,6 @@ 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;
|
||||||
|
@ -364,6 +363,7 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev)
|
||||||
} else {
|
} else {
|
||||||
out_be32(tbipa, tbiaddr);
|
out_be32(tbipa, tbiaddr);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
err = of_mdiobus_register(new_bus, np);
|
err = of_mdiobus_register(new_bus, np);
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
Loading…
Reference in a new issue