From: Tomas Henzl Date: Tue, 1 Nov 2016 16:32:02 +0000 (+0100) Subject: scsi: megaraid-sas: request irqs later X-Git-Tag: v4.1.12-92~2^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e159564f0e5314e5fce915913c2658af78d8e050;p=users%2Fjedix%2Flinux-maple.git scsi: megaraid-sas: request irqs later Orabug: 25568930 It is not good when an irq arrives before driver structures are allocated. Signed-off-by: Tomas Henzl Acked-by: Sumit Saxena Signed-off-by: Martin K. Petersen (cherry picked from commit 18103efcacee0563d57c3b7af8d849faae62a117) Signed-off-by: Brian Maly --- diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 09e89b8ab3950..b1c48e59854fb 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -5150,11 +5150,6 @@ static int megasas_init_fw(struct megasas_instance *instance) tasklet_init(&instance->isr_tasklet, instance->instancet->tasklet, (unsigned long)instance); - if (instance->msix_vectors ? - megasas_setup_irqs_msix(instance, 1) : - megasas_setup_irqs_ioapic(instance)) - goto fail_setup_irqs; - instance->ctrl_info = kzalloc(sizeof(struct megasas_ctrl_info), GFP_KERNEL); if (instance->ctrl_info == NULL) @@ -5170,6 +5165,10 @@ static int megasas_init_fw(struct megasas_instance *instance) if (instance->instancet->init_adapter(instance)) goto fail_init_adapter; + if (instance->msix_vectors ? + megasas_setup_irqs_msix(instance, 1) : + megasas_setup_irqs_ioapic(instance)) + goto fail_init_adapter; instance->instancet->enable_intr(instance); @@ -5309,9 +5308,8 @@ static int megasas_init_fw(struct megasas_instance *instance) fail_get_pd_list: instance->instancet->disable_intr(instance); -fail_init_adapter: megasas_destroy_irqs(instance); -fail_setup_irqs: +fail_init_adapter: if (instance->msix_vectors) pci_disable_msix(instance->pdev); instance->msix_vectors = 0;