From 83d9834e776e5fdd9f1df6e17e5c8b0517cd5184 Mon Sep 17 00:00:00 2001
From: DIALLO David <diallo@et.esiea.fr>
Date: Mon, 15 Dec 2014 16:45:39 +0100
Subject: [PATCH] fix CID 1257762:  Logically dead code(DEADCODE)

---
 src/app-layer-modbus.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app-layer-modbus.c b/src/app-layer-modbus.c
index 7d23bcacc4..d2518b5313 100644
--- a/src/app-layer-modbus.c
+++ b/src/app-layer-modbus.c
@@ -829,7 +829,7 @@ static int ModbusParseDiagnosticRequest(ModbusTransaction   *tx,
     if (tx->subFunction != MODBUS_SUBFUNC_QUERY_DATA) {
         switch (tx->subFunction) {
             case MODBUS_SUBFUNC_RESTART_COM:
-                if ((data != 0x00) || (data != 0xFF00))
+                if ((data != 0x00) && (data != 0xFF00))
                     goto error;
                 break;