commit 3e150cf51d9242ae4ef9c872cdf6766ee5115c44
author Dan Carpenter <dan.carpenter@oracle.com> Tue Jan 17 10:31:52 2012 +0300
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> Thu Feb 09 09:51:17 2012 -0800
tree 280a587c1b7a88de3057ea992bbfeb1b93ba1cd9
parent 190f998b7951bcb8aff7e1fd023f25d0adcc5045

Staging: sbe-2t3e3: logical || vs bitwise |

Bitwise OR was clearly intended here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/sbe-2t3e3/intr.c

diff --git a/drivers/staging/sbe-2t3e3/intr.c b/drivers/staging/sbe-2t3e3/intr.c
index 7ad1a83..1336aab 100644
--- a/drivers/staging/sbe-2t3e3/intr.c
+++ b/drivers/staging/sbe-2t3e3/intr.c
@@ -188,7 +188,7 @@
 			}
 
 			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);
 			}