Home Home > GIT Browse > SLE12-SP4-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-05-14 13:00:42 +0200
committerTakashi Iwai <tiwai@suse.de>2019-05-14 13:00:42 +0200
commit7fa5c72617bc5a14ac7674e27e008753786d9103 (patch)
treee8cf9ca82f49b8aac05b806b9ea554becf1976cc
parentabcdcceb7539aa76f934279046547a441ebe5af1 (diff)
parent77602819f06c18311430ffb3b0f76aec15afda8f (diff)
Merge branch 'users/hare/SLE15/for-next' into SLE15
Pull scsi fix from Hannes Reinecke suse-commit: e241de49cc7fd60729fe5197ea9e91e1dadc3858
-rw-r--r--drivers/scsi/lpfc/lpfc_scsi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 100a4a5a5b99..d1aab85f5102 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -3932,7 +3932,8 @@ int lpfc_sli4_scmd_to_wqidx_distr(struct lpfc_hba *phba,
uint32_t tag;
uint16_t hwq;
- if (cmnd && shost_use_blk_mq(cmnd->device->host)) {
+ if (cmnd && shost_use_blk_mq(cmnd->device->host) &&
+ cmnd->request && cmnd->request->q) {
tag = blk_mq_unique_tag(cmnd->request);
hwq = blk_mq_unique_tag_to_hwq(tag);