From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 2 Apr 2011 16:36:17 +0000 (+0000)
Subject: rtl8306: do not overwrite registers in the phy fixup, it could mess up other switches... 
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=3e9da9b162017a2e76d31bee91c0de1a10077159

rtl8306: do not overwrite registers in the phy fixup, it could mess up other switches (fixes #8911), backport of r26410

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26411 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
index 4fa910a6f..78ded0ace 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8306.c
@@ -56,6 +56,7 @@ struct rtl_priv {
 	int do_cpu;
 	struct mii_bus *bus;
 	char hwname[sizeof(RTL_NAME_UNKNOWN)];
+	bool fixup;
 };
 
 struct rtl_phyregs {
@@ -256,6 +257,9 @@ rtl_set_page(struct rtl_priv *priv, unsigned int page)
 	struct mii_bus *bus = priv->bus;
 	u16 pgsel;
 
+	if (priv->fixup)
+		return;
+
 	if (priv->page == page)
 		return;
 
@@ -923,6 +927,8 @@ rtl8306_fixup(struct phy_device *pdev)
 	if (pdev->addr != 0 && pdev->addr != 4)
 		return 0;
 
+	memset(&priv, 0, sizeof(priv));
+	priv.fixup = true;
 	priv.page = -1;
 	priv.bus = pdev->bus;
 	chipid = rtl_get(&priv.dev, RTL_REG_CHIPID);