summaryrefslogtreecommitdiff
path: root/drivers/staging/sbe-2t3e3/intr.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-01-17 10:31:52 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-09 09:51:17 -0800
commit3e150cf51d9242ae4ef9c872cdf6766ee5115c44 (patch)
tree280a587c1b7a88de3057ea992bbfeb1b93ba1cd9 /drivers/staging/sbe-2t3e3/intr.c
parent190f998b7951bcb8aff7e1fd023f25d0adcc5045 (diff)
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>
Diffstat (limited to 'drivers/staging/sbe-2t3e3/intr.c')
-rw-r--r--drivers/staging/sbe-2t3e3/intr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/sbe-2t3e3/intr.c b/drivers/staging/sbe-2t3e3/intr.c
index 7ad1a8382037..1336aab11bdd 100644
--- a/drivers/staging/sbe-2t3e3/intr.c
+++ b/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);
}