]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
scsi: pm80xx: fix logic to break out of loop when register value is 2 or 3
authorColin Ian King <colin.king@canonical.com>
Wed, 20 Nov 2019 13:50:31 +0000 (13:50 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 27 Nov 2019 02:30:12 +0000 (21:30 -0500)
The condition (reg_val != 2) || (reg_val != 3) will always be true because
reg_val cannot be equal to two different values at the same time. Fix this
by replacing the || operator with && so that the loop will loop if reg_val
is not a 2 and not a 3 as was originally intended.

Fixes: 50dc2f221455 ("scsi: pm80xx: Modified the logic to collect fatal dump")
Link: https://lore.kernel.org/r/20191120135031.270708-1-colin.king@canonical.com
Addresses-Coverity: ("Constant expression result")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Jack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/pm8001/pm80xx_hwi.c

index 19601138e8893468d9733f28b3af6ce3ad473d1b..d41908b237602188ff9e0f65346f9984c6ccbe6e 100644 (file)
@@ -348,7 +348,7 @@ moreData:
                        do {
                                reg_val = pm8001_mr32(fatal_table_address,
                                        MPI_FATAL_EDUMP_TABLE_STATUS);
-                       } while (((reg_val != 2) || (reg_val != 3)) &&
+                       } while (((reg_val != 2) && (reg_val != 3)) &&
                                        time_before(jiffies, start));
 
                        if (reg_val < 2) {