1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index c0755565fae9..4e46045dea6d 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -682,6 +682,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
         IOCB_t *iocb_cmd = &lpfc_cmd->cur_iocbq.iocb;
         struct lpfc_iocbq *piocbq = &(lpfc_cmd->cur_iocbq);
         int datadir = scsi_cmnd->sc_data_direction;
+        char tag[2];
 
         lpfc_cmd->fcp_rsp->rspSnsLen = 0;
         /* clear task management bits */
@@ -692,8 +693,8 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
 
         memcpy(&fcp_cmnd->fcpCdb[0], scsi_cmnd->cmnd, 16);
 
-        if (scsi_cmnd->device->tagged_supported) {
-                switch (scsi_cmnd->tag) {
+        if (scsi_populate_tag_msg(scsi_cmnd, tag)) {
+                switch (tag[0]) {
                 case HEAD_OF_QUEUE_TAG:
                         fcp_cmnd->fcpCntl1 = HEAD_OF_Q;
                         break;