2 files changed, 11 insertions, 7 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index f74d07a9e945..9e3eaac25596 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3495,15 +3495,17 @@ qla2x00_loop_resync(scsi_qla_host_t *vha)
 }
 
 void
-qla2x00_update_fcports(scsi_qla_host_t *vha)
+qla2x00_update_fcports(scsi_qla_host_t *base_vha)
 {
         fc_port_t *fcport;
+        struct scsi_qla_host *tvp, *vha;
 
         /* Go with deferred removal of rport references. */
-        list_for_each_entry(fcport, &vha->vp_fcports, list)
-                if (fcport && fcport->drport &&
-                    atomic_read(&fcport->state) != FCS_UNCONFIGURED)
-                        qla2x00_rport_del(fcport);
+        list_for_each_entry_safe(vha, tvp, &base_vha->hw->vp_list, list)
+                list_for_each_entry(fcport, &vha->vp_fcports, list)
+                        if (fcport && fcport->drport &&
+                            atomic_read(&fcport->state) != FCS_UNCONFIGURED)
+                                qla2x00_rport_del(fcport);
 }
 
 /*
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 210229019588..b79fca7d461b 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2181,17 +2181,19 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,
     int defer)
 {
         struct fc_rport *rport;
+        scsi_qla_host_t *base_vha;
 
         if (!fcport->rport)
                 return;
 
         rport = fcport->rport;
         if (defer) {
+                base_vha = pci_get_drvdata(vha->hw->pdev);
                 spin_lock_irq(vha->host->host_lock);
                 fcport->drport = rport;
                 spin_unlock_irq(vha->host->host_lock);
-                set_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags);
-                qla2xxx_wake_dpc(vha);
+                set_bit(FCPORT_UPDATE_NEEDED, &base_vha->dpc_flags);
+                qla2xxx_wake_dpc(base_vha);
         } else
                 fc_remote_port_delete(rport);
 }