---

yaml --- r: 277535 b: refs/heads/master c: c3e072f h: refs/heads/master i: 277533: b055975 277531: 3d6b844 277527: aa72e86 277519: 65a76b0 277503: 3d6add5 v: v3
git-mirror · Nov 14, 2011 · 55b98b4 · 55b98b4
1 parent 2d6e4a7
commit 55b98b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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",