From 87087f042e4cbd17e79bee4c334f5d75457b145a Mon Sep 17 00:00:00 2001
From: roel kluin <roel.kluin@gmail.com>
Date: Fri, 14 Aug 2009 02:09:56 +0000
Subject: [PATCH] --- yaml --- r: 156908 b: refs/heads/master c:
 0527a1a8440a20b3d0fd1d0c9e75a6f38a9d5315 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ba236d6e6893..bd45d724b78d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88512935a24305fea7aecc9ba4d675869e97fc2a
+refs/heads/master: 0527a1a8440a20b3d0fd1d0c9e75a6f38a9d5315
diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c
index 3ba35956327a..cee08a1e497a 100644
--- a/trunk/drivers/net/via-velocity.c
+++ b/trunk/drivers/net/via-velocity.c
@@ -1778,7 +1778,7 @@ static void velocity_error(struct velocity_info *vptr, int status)
 			 *	 mode
 			 */
 			if (vptr->rev_id < REV_ID_VT3216_A0) {
-				if (vptr->mii_status | VELOCITY_DUPLEX_FULL)
+				if (vptr->mii_status & VELOCITY_DUPLEX_FULL)
 					BYTE_REG_BITS_ON(TCR_TB2BDIS, &regs->TCR);
 				else
 					BYTE_REG_BITS_OFF(TCR_TB2BDIS, &regs->TCR);