1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 3f23932210c..785c61279e6 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -69,9 +69,10 @@ static scsi_qla_host_t *
 qla24xx_find_vhost_by_name(struct qla_hw_data *ha, uint8_t *port_name)
 {
         scsi_qla_host_t *vha;
+        struct scsi_qla_host *tvha;
 
         /* Locate matching device in database. */
-        list_for_each_entry(vha, &ha->vp_list, list) {
+        list_for_each_entry_safe(vha, tvha, &ha->vp_list, list) {
                 if (!memcmp(port_name, vha->port_name, WWN_SIZE))
                         return vha;
         }
@@ -194,11 +195,11 @@ qla24xx_configure_vp(scsi_qla_host_t *vha)
 void
 qla2x00_alert_all_vps(struct rsp_que *rsp, uint16_t *mb)
 {
-        scsi_qla_host_t *vha;
+        scsi_qla_host_t *vha, *tvha;
         struct qla_hw_data *ha = rsp->hw;
         int i = 0;
 
-        list_for_each_entry(vha, &ha->vp_list, list) {
+        list_for_each_entry_safe(vha, tvha, &ha->vp_list, list) {
                 if (vha->vp_idx) {
                         switch (mb[0]) {
                         case MBA_LIP_OCCURRED:
@@ -300,6 +301,7 @@ qla2x00_do_dpc_all_vps(scsi_qla_host_t *vha)
         int ret;
         struct qla_hw_data *ha = vha->hw;
         scsi_qla_host_t *vp;
+        struct scsi_qla_host *tvp;
 
         if (vha->vp_idx)
                 return;
@@ -308,7 +310,7 @@ qla2x00_do_dpc_all_vps(scsi_qla_host_t *vha)
 
         clear_bit(VP_DPC_NEEDED, &vha->dpc_flags);
 
-        list_for_each_entry(vp, &ha->vp_list, list) {
+        list_for_each_entry_safe(vp, tvp, &ha->vp_list, list) {
                 if (vp->vp_idx)
                         ret = qla2x00_do_dpc_vp(vp);
         }