scsi: qla2xxx: fix NPIV tear down process

Fix two issues with commit f5187b7d1ac6 ("scsi: qla2xxx: Optimize NPIV
tear down process"): a missing negation in a wait_event_timeout()
condition, and a missing loop end condition.

Fixes: f5187b7d1ac6 ("scsi: qla2xxx: Optimize NPIV tear down process")
Link: https://lore.kernel.org/r/20191105145550.10268-1-martin.wilck@suse.com
Signed-off-by: Martin Wilck <mwilck@suse.com>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

2 files changed, 10 insertions, 6 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 6afad68e5ba2..238240984bc1 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -76,9 +76,11 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
          * ensures no active vp_list traversal while the vport is removed
          * from the queue)
          */
-        for (i = 0; i < 10 && atomic_read(&vha->vref_count); i++)
-                wait_event_timeout(vha->vref_waitq,
-                    atomic_read(&vha->vref_count), HZ);
+        for (i = 0; i < 10; i++) {
+                if (wait_event_timeout(vha->vref_waitq,
+                    !atomic_read(&vha->vref_count), HZ) > 0)
+                        break;
+        }
 
         spin_lock_irqsave(&ha->vport_slock, flags);
         if (atomic_read(&vha->vref_count)) {
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 3568031c6504..e6ff17f38178 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1119,9 +1119,11 @@ qla2x00_wait_for_sess_deletion(scsi_qla_host_t *vha)
 
         qla2x00_mark_all_devices_lost(vha, 0);
 
-        for (i = 0; i < 10; i++)
-                wait_event_timeout(vha->fcport_waitQ, test_fcport_count(vha),
-                    HZ);
+        for (i = 0; i < 10; i++) {
+                if (wait_event_timeout(vha->fcport_waitQ,
+                    test_fcport_count(vha), HZ) > 0)
+                        break;
+        }
 
         flush_workqueue(vha->hw->wq);
 }