1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index a87fb9f00ac4..437d169a9814 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -398,9 +398,21 @@ static int qla4xxx_queuecommand(struct scsi_cmnd *cmd,
 {
         struct scsi_qla_host *ha = to_qla_host(cmd->device->host);
         struct ddb_entry *ddb_entry = cmd->device->hostdata;
+        struct iscsi_cls_session *sess = ddb_entry->sess;
         struct srb *srb;
         int rval;
 
+        if (!sess) {
+                cmd->result = DID_IMM_RETRY << 16;
+                goto qc_fail_command;
+        }
+
+        rval = iscsi_session_chkready(sess);
+        if (rval) {
+                cmd->result = rval;
+                goto qc_fail_command;
+        }
+
         if (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE) {
                 if (atomic_read(&ddb_entry->state) == DDB_STATE_DEAD) {
                         cmd->result = DID_NO_CONNECT << 16;