From 33a4a3f4d4f17693c47b05ec8924084feb83cc6b Mon Sep 17 00:00:00 2001
From: Kenth Eriksson <kenth.eriksson@transmode.com>
Date: Tue, 27 Mar 2012 22:05:54 +0000
Subject: [PATCH] --- yaml --- r: 298479 b: refs/heads/master c:
 464b57da56910c8737ede75ad820b9a7afc46b3e h: refs/heads/master i:   298477:
 d53d684b7cfb640562e3ab53ac3c279459d7ab6a   298475:
 2b6eb90ebe744b6430af8d60929b7a570d543628   298471:
 0f414ca66b2f091c667c8cda45cadc872aa41614   298463:
 190ae0da0a6b9a8cbd18fb2ff3ee1cdc4741068a 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 2b729b1f65cb..fb885402bd4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67378563df2e168d32a4054616f244a91aec462d
+refs/heads/master: 464b57da56910c8737ede75ad820b9a7afc46b3e
diff --git a/trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index 9eb815941df5..f7f0bf5d037b 100644
--- a/trunk/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/trunk/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);