Commit 964d069f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents eec79181 8c65830a

drivers/scsi/lpfc/lpfc_nvme.c

+3 −0
Original line number Diff line number Diff line
@@ -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.