From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 17 Jan 2012 07:31:52 +0000 (+0300)
Subject: Staging: sbe-2t3e3: logical || vs bitwise |
X-Git-Tag: MMI-PSA29.97-13-9~17268^2~176^2~56
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e150cf51d9242ae4ef9c872cdf6766ee5115c44;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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);
 			}