---

yaml --- r: 279421 b: refs/heads/master c: 4852968 h: refs/heads/master i: 279419: 755a5f3 v: v3
git-mirror · Jan 4, 2012 · c502dfc · c502dfc
1 parent c5092eb
commit c502dfc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 853d5dc95b41babb7001934becad9c944738d8e3
+refs/heads/master: 48529680dc59061eaa13ea3b1047401612b79600
diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c
@@ -735,9 +735,10 @@ static void r6040_mac_address(struct net_device *dev)
 	void __iomem *ioaddr = lp->base;
 	u16 *adrp;
 
-	/* MAC operation register */
-	iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */
-	iowrite16(MAC_SM_RST, ioaddr + MAC_SM); /* Reset internal state machine */
+	/* Reset MAC */
+	iowrite16(MAC_RST, ioaddr + MCR1);
+	/* Reset internal state machine */
+	iowrite16(MAC_SM_RST, ioaddr + MAC_SM);
 	iowrite16(0, ioaddr + MAC_SM);
 	mdelay(5);