diff options
| author | Kenth Eriksson <kenth.eriksson@transmode.com> | 2012-03-28 00:05:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-01 22:47:12 +0200 |
| commit | 464b57da56910c8737ede75ad820b9a7afc46b3e (patch) | |
| tree | 0d5ec220c1dbe97b9fdfe4f6bd0e748cddf191a7 | |
| parent | net/garp: avoid infinite loop if attribute already exists (diff) | |
| download | linux-464b57da56910c8737ede75ad820b9a7afc46b3e.tar.xz linux-464b57da56910c8737ede75ad820b9a7afc46b3e.zip | |
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: Kenth Eriksson <kenth.eriksson@transmode.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/freescale/fsl_pq_mdio.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c index 9eb815941df5..f7f0bf5d037b 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -356,13 +356,13 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) if (prop) tbiaddr = *prop; - } - if (tbiaddr == -1) { - err = -EBUSY; - goto err_free_irqs; - } else { - out_be32(tbipa, tbiaddr); + if (tbiaddr == -1) { + err = -EBUSY; + goto err_free_irqs; + } else { + out_be32(tbipa, tbiaddr); + } } err = of_mdiobus_register(new_bus, np); |