Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1010f21e authored by Himanshu Madhani's avatar Himanshu Madhani Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Initialize Work element before requesting IRQs 



commit a9e170e2 ("scsi: qla2xxx: Fix uninitialized work element")
moved initializiation of work element earlier in the probe to fix call
stack. However, it still leaves a window where interrupt can be
generated before work element is initialized. Fix that window by
initializing work element before we are requesting IRQs.

[mkp: fixed typos]

Fixes: a9e170e2 ("scsi: qla2xxx: Fix uninitialized work element")
Cc: <stable@vger.kernel.org> # 4.13
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ab31fd0c

drivers/scsi/qla2xxx/qla_os.c

+2 −2
Original line number Diff line number Diff line
@@ -3061,6 +3061,8 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	    host->max_cmd_len, host->max_channel, host->max_lun,

	    host->transportt, sht->vendor_id);



	INIT_WORK(&base_vha->iocb_work, qla2x00_iocb_work_fn);



	/* Set up the irqs */

	ret = qla2x00_request_irqs(ha, rsp);

	if (ret)
@@ -3175,8 +3177,6 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	    host->can_queue, base_vha->req,

	    base_vha->mgmt_svr_loop_id, host->sg_tablesize);



	INIT_WORK(&base_vha->iocb_work, qla2x00_iocb_work_fn);



	if (ha->mqenable) {

		bool mq = false;

		bool startit = false;