Merge tag 'dmaengine-fix-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul...

[linux-2.6-microblaze.git] / drivers / scsi / qla2xxx / qla_target.c

diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 7d8242c..8993d43 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -1003,6 +1003,7 @@ void qlt_free_session_done(struct work_struct *work)
                                        "%s bypassing release_all_sadb\n",
                                        __func__);
                        }
+                       qla_edif_clear_appdata(vha, sess);
                        qla_edif_sess_down(vha, sess);
                }
                qla2x00_mark_device_lost(vha, sess, 0);
@@ -4812,7 +4813,7 @@ static int qlt_handle_login(struct scsi_qla_host *vha,
        }
 
        if (vha->hw->flags.edif_enabled) {
-               if (!(vha->e_dbell.db_flags & EDB_ACTIVE)) {
+               if (DBELL_INACTIVE(vha)) {
                        ql_dbg(ql_dbg_disc, vha, 0xffff,
                               "%s %d Term INOT due to app not started lid=%d, NportID %06X ",
                               __func__, __LINE__, loop_id, port_id.b24);