---

yaml --- r: 289024 b: refs/heads/master c: 3e150cf h: refs/heads/master v: v3
git-mirror · Feb 9, 2012 · 2891a1d · 2891a1d
1 parent 4a6edb2
commit 2891a1d
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: 190f998b7951bcb8aff7e1fd023f25d0adcc5045
+refs/heads/master: 3e150cf51d9242ae4ef9c872cdf6766ee5115c44
diff --git 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);
 			}