diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2019-11-20 13:50:31 +0000 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2019-11-26 21:30:12 -0500 |
| commit | 0e7c353e1828819eb92af0a64fc9b2f4f778b76e (patch) | |
| tree | fd945aeeb00d0282f3c715ae2f3454a8e9f5dc2a /drivers/scsi/pm8001/pm80xx_hwi.c | |
| parent | scsi: scsi_transport_sas: Fix memory leak when removing devices (diff) | |
| download | linux-dev-0e7c353e1828819eb92af0a64fc9b2f4f778b76e.tar.xz linux-dev-0e7c353e1828819eb92af0a64fc9b2f4f778b76e.zip | |
scsi: pm80xx: fix logic to break out of loop when register value is 2 or 3
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>
Diffstat (limited to 'drivers/scsi/pm8001/pm80xx_hwi.c')
| -rw-r--r-- | drivers/scsi/pm8001/pm80xx_hwi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c index 19601138e889..d41908b23760 100644 --- a/drivers/scsi/pm8001/pm80xx_hwi.c +++ b/drivers/scsi/pm8001/pm80xx_hwi.c @@ -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) { |