diff options
| author | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-04-14 09:13:39 -0500 |
| commit | 4905660cd237e4c4ede46920851caa12739f006f (patch) | |
| tree | ef37e7c9f52c9ae9c2b206658556f37d67fe43eb /drivers/net/ethernet/freescale/fsl_pq_mdio.c | |
| parent | 1b5e39fc18a1b8ff7ea425ce5f49307cb28a880f (diff) | |
| parent | 0147c2ae9d602b5791dae30322ece475271acd10 (diff) | |
Merge commit 'v3.2.15' into rt-3.2.15-rt24v3.2.15-rt24
Diffstat (limited to 'drivers/net/ethernet/freescale/fsl_pq_mdio.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/fsl_pq_mdio.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c index 4d9f84b8ab97..ada234afabf5 100644 --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -356,16 +356,15 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) if (prop) tbiaddr = *prop; - } - - if (tbiaddr == -1) { - err = -EBUSY; - goto err_free_irqs; + if (tbiaddr == -1) { + err = -EBUSY; + goto err_free_irqs; + } else { + out_be32(tbipa, tbiaddr); + } } - out_be32(tbipa, tbiaddr); - err = of_mdiobus_register(new_bus, np); if (err) { printk (KERN_ERR "%s: Cannot register as MDIO bus\n", |