diff options
| author | Linus Torvalds | 2021-02-06 14:42:52 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2021-02-06 14:42:52 -0800 |
| commit | 964d069f93c4468b220f7e15fac7a3f7bd6d13ec (patch) | |
| tree | dacd7c94bfe4ec13436995723a1627389316a5e8 | |
| parent | eec79181212c9c2670423400a9e78bb1f0c0075d (diff) | |
| parent | 8c65830ae1629b03e5d65e9aafae7e2cf5f8b743 (diff) | |
Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fix from James Bottomley:
"One fix in drivers (lpfc) that stops an oops on resource exhaustion"
* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: lpfc: Fix EEH encountering oops with NVMe traffic
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_nvme.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index 1cb82fa6a60e..39d147e251bf 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c @@ -559,6 +559,9 @@ __lpfc_nvme_ls_req(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, return -ENODEV; } + if (!vport->phba->sli4_hba.nvmels_wq) + return -ENOMEM; + /* * there are two dma buf in the request, actually there is one and * the second one is just the start address + cmd size. |