static void ufshcd_add_command_trace(struct ufs_hba *hba, unsigned int tag,
                                     enum ufs_trace_str_t str_t)
 {
-       u64 lba;
+       u64 lba = 0;
        u8 opcode = 0, group_id = 0;
        u32 intr, doorbell;
        struct ufshcd_lrb *lrbp = &hba->lrb[tag];
                return;
 
        opcode = cmd->cmnd[0];
-       lba = scsi_get_lba(cmd);
 
        if (opcode == READ_10 || opcode == WRITE_10) {
                /*
                 */
                transfer_len =
                       be32_to_cpu(lrbp->ucd_req_ptr->sc.exp_data_transfer_len);
+               lba = scsi_get_lba(cmd);
                if (opcode == WRITE_10)
                        group_id = lrbp->cmd->cmnd[6];
        } else if (opcode == UNMAP) {
                 * The number of Bytes to be unmapped beginning with the lba.
                 */
                transfer_len = blk_rq_bytes(rq);
+               lba = scsi_get_lba(cmd);
        }
 
        intr = ufshcd_readl(hba, REG_INTERRUPT_STATUS);