From 55b98b4d1a6794fc30903c6b069e3ec3aa9699f5 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Mon, 14 Nov 2011 08:21:30 +0200 Subject: [PATCH] --- yaml --- r: 277535 b: refs/heads/master c: c3e072f8a6c5625028531c40ec65f7e301531be2 h: refs/heads/master i: 277533: b05597565e543e74c971369342adc16f71e75e9f 277531: 3d6b8443414a77dbd679a7afbc4e2bc0ec6f21a4 277527: aa72e862c081d675e57317d24afdbd87c682e965 277519: 65a76b0d036b38afdbc4dc48b3d6bcc4e52bac4c 277503: 3d6add57f2c8a23818d70a1d170e3506250746f9 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 32596a798428..cde095c82d67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 452448f9283e1939408b397e87974a418825b0a8 +refs/heads/master: c3e072f8a6c5625028531c40ec65f7e301531be2 diff --git a/trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c index 4d9f84b8ab97..8dee1aed47e4 100644 --- a/trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c +++ b/trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c @@ -356,16 +356,16 @@ static int fsl_pq_mdio_probe(struct platform_device *ofdev) if (prop) tbiaddr = *prop; - } - if (tbiaddr == -1) { - err = -EBUSY; + if (tbiaddr == -1) { + err = -EBUSY; - goto err_free_irqs; + 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",