[PATCH] staging: dgap: fix "if" statement that always evaluates to true
Daeseok Youn
daeseok.youn at gmail.com
Fri Jan 23 11:44:28 UTC 2015
cppcheck warning:
(warnning) Logical disjunction always evaluates to true
Reported-by: David Binderman <dcb314 at hotmail.com>
Signed-off-by: Daeseok Youn <daeseok.youn at gmail.com>
---
drivers/staging/dgap/dgap.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 518ab56..7184747 100644
--- a/drivers/staging/dgap/dgap.c
+++ b/drivers/staging/dgap/dgap.c
@@ -978,8 +978,8 @@ static int dgap_parsefile(char **in)
brd->u.board.conc1++;
conc_type = dgap_gettok(in);
- if (conc_type == 0 || conc_type != CX ||
- conc_type != EPC) {
+ if (conc_type == 0 || (conc_type != CX &&
+ conc_type != EPC)) {
pr_err("failed to set a type of concentratros");
return -1;
}
@@ -1019,8 +1019,8 @@ static int dgap_parsefile(char **in)
brd->u.board.module1++;
module_type = dgap_gettok(in);
- if (module_type == 0 || module_type != PORTS ||
- module_type != MODEM) {
+ if (module_type == 0 || (module_type != PORTS &&
+ module_type != MODEM)) {
pr_err("failed to set a type of module");
return -1;
}
--
1.7.1
More information about the devel
mailing list