From 2891a1d809bbc71f9957486e5d8da13436aacb6d Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 17 Jan 2012 10:31:52 +0300
Subject: [PATCH] --- yaml --- r: 289024 b: refs/heads/master c:
 3e150cf51d9242ae4ef9c872cdf6766ee5115c44 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/sbe-2t3e3/intr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 92da8ba32d55..cc3319808c55 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 190f998b7951bcb8aff7e1fd023f25d0adcc5045
+refs/heads/master: 3e150cf51d9242ae4ef9c872cdf6766ee5115c44
diff --git a/trunk/drivers/staging/sbe-2t3e3/intr.c b/trunk/drivers/staging/sbe-2t3e3/intr.c
index 7ad1a8382037..1336aab11bdd 100644
--- a/trunk/drivers/staging/sbe-2t3e3/intr.c
+++ b/trunk/drivers/staging/sbe-2t3e3/intr.c
@@ -188,7 +188,7 @@ void dc_intr_rx(struct channel *sc)
 			}
 
 			if (sc->s.LOS) {
-				error_mask &= ~(SBE_2T3E3_RX_DESC_DRIBBLING_BIT ||
+				error_mask &= ~(SBE_2T3E3_RX_DESC_DRIBBLING_BIT |
 						SBE_2T3E3_RX_DESC_MII_ERROR);
 			}