From 47a455e91be287089bfcf2fd0798e743ea1ea085 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 18 Feb 2009 10:19:50 +0100 Subject: [PATCH] --- yaml --- r: 131698 b: refs/heads/master c: 62660e28084df3d8067ab855f326d3027808c569 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/sundance.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3e9fae91d67c..616ff6239a39 100644 --- 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 index feaf0e0577d7..43695b76606f 100644 --- 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); } }