Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/net/ethernet/freescale/fsl_pq_mdio.c

+6 −6
Original line number Diff line number Diff line
@@ -356,7 +356,6 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 


		if (prop)

			tbiaddr = *prop;

	}



		if (tbiaddr == -1) {

			err = -EBUSY;
@@ -364,6 +363,7 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) 
		} else {

			out_be32(tbipa, tbiaddr);

		}

	}



	err = of_mdiobus_register(new_bus, np);

	if (err) {