From 3e19357d20dcf80aa7f1b1039638cd1e86ac02ff Mon Sep 17 00:00:00 2001
From: Haiying Wang <Haiying.Wang@freescale.com>
Date: Tue, 2 Jun 2009 04:04:14 +0000
Subject: [PATCH] --- yaml --- r: 150614 b: refs/heads/master c:
 fbcc0e2ce5a4fde63c7f33153bd7e3a4791e01c8 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/fsl_pq_mdio.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 30c5fcea5578..cd133071b5d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32d0c1e1bee16781e94c7ea8c75499696bce0a33
+refs/heads/master: fbcc0e2ce5a4fde63c7f33153bd7e3a4791e01c8
diff --git a/trunk/drivers/net/fsl_pq_mdio.c b/trunk/drivers/net/fsl_pq_mdio.c
index d12e0e0336f4..3af581303ca2 100644
--- a/trunk/drivers/net/fsl_pq_mdio.c
+++ b/trunk/drivers/net/fsl_pq_mdio.c
@@ -301,13 +301,17 @@ static int fsl_pq_mdio_probe(struct of_device *ofdev,
 			of_device_is_compatible(np, "ucc_geth_phy")) {
 #ifdef CONFIG_UCC_GETH
 		u32 id;
+		static u32 mii_mng_master;
 
 		tbipa = &regs->utbipar;
 
 		if ((err = get_ucc_id_for_range(addr, addr + size, &id)))
 			goto err_free_irqs;
 
-		ucc_set_qe_mux_mii_mng(id - 1);
+		if (!mii_mng_master) {
+			mii_mng_master = id;
+			ucc_set_qe_mux_mii_mng(id - 1);
+		}
 #else
 		err = -ENODEV;
 		goto err_free_irqs;