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

Commit 7992abfc authored Nov 23, 2010 by Mike Hernandez Committed by James Bottomley Dec 09, 2010

[SCSI] qla2xxx: Change MSI initialization from using incorrect request_irq parameter.

IRQF_SHARED flag should not be set when calling request_irq for MSI
since this interrupt mechanism cannot be shared like standard INTx.

Signed-off-by: Mike Hernandez <michael.hernandez@qlogic.com>
Signed-off-by: Madhuranath Iyengar <Madhu.Iyengar@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent 85727e1f

drivers/scsi/qla2xxx/qla_def.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2409,7 +2409,6 @@ struct qla_hw_data {
	uint32_t enable_target_reset :1;		uint32_t enable_target_reset :1;
	uint32_t enable_lip_full_login :1;		uint32_t enable_lip_full_login :1;
	uint32_t enable_led_scheme :1;		uint32_t enable_led_scheme :1;
	uint32_t inta_enabled :1;
	uint32_t msi_enabled :1;		uint32_t msi_enabled :1;
	uint32_t msix_enabled :1;		uint32_t msix_enabled :1;
	uint32_t disable_serdes :1;		uint32_t disable_serdes :1;

drivers/scsi/qla2xxx/qla_isr.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2491,14 +2491,15 @@ qla2x00_request_irqs(struct qla_hw_data ha, struct rsp_que rsp)
	skip_msi:		skip_msi:

	ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,		ret = request_irq(ha->pdev->irq, ha->isp_ops->intr_handler,
	IRQF_SHARED, QLA2XXX_DRIVER_NAME, rsp);		ha->flags.msi_enabled ? 0 : IRQF_SHARED,
			QLA2XXX_DRIVER_NAME, rsp);
	if (ret) {		if (ret) {
	qla_printk(KERN_WARNING, ha,		qla_printk(KERN_WARNING, ha,
	"Failed to reserve interrupt %d already in use.\n",		"Failed to reserve interrupt %d already in use.\n",
	ha->pdev->irq);		ha->pdev->irq);
	goto fail;		goto fail;
	}		}
	ha->flags.inta_enabled = 1;
	clear_risc_ints:		clear_risc_ints:

	/*		/*