staging: dgap: fix "if" statement that always evaluates to true

cppcheck warning:
(warnning) Logical disjunction always evaluates to true

Reported-by: David Binderman <dcb314@hotmail.com>
Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/dgap/dgap.c b/drivers/staging/dgap/dgap.c
index 518ab567ca4e4a71a21c03b2b6386a2b19afe377..7184747e0652ca39799a1b104888a4205297db38 100644 (file)
--- 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;
                        }