---

yaml --- r: 131698 b: refs/heads/master c: 62660e2 h: refs/heads/master v: v3
git-mirror · Feb 20, 2009 · 47a455e · 47a455e
1 parent 965f219
commit 47a455e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9df8f4e3ee760c14211a5f484e9ee4f0bc0c566b
+refs/heads/master: 62660e28084df3d8067ab855f326d3027808c569
diff --git a/trunk/drivers/net/sundance.c b/trunk/drivers/net/sundance.c
@@ -909,7 +909,7 @@ static void check_duplex(struct net_device *dev)
 			printk(KERN_INFO "%s: Setting %s-duplex based on MII #%d "
 				   "negotiated capability %4.4x.\n", dev->name,
 				   duplex ? "full" : "half", np->phys[0], negotiated);
-		iowrite16(ioread16(ioaddr + MACCtrl0) | duplex ? 0x20 : 0, ioaddr + MACCtrl0);
+		iowrite16(ioread16(ioaddr + MACCtrl0) | (duplex ? 0x20 : 0), ioaddr + MACCtrl0);
 	}
 }