megaraid: Fail resume if MSI-X re-initialization failed

Currently the driver fails to analize MSI-X re-enablement
status on resuming and always assumes the success. This
update checks the MSI-X initialization result and fails
to resume if MSI-Xs re-enablement failed.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Acked-by: Kashyap Desai <Kashyap.desai@avagotech.com>
Cc: Neela Syam Kolli <megaraidlinux@lsi.com>
Cc: linux-scsi@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 22a04e37b70acfa63b3f3cb7e61ddb31ef9ec209..e4ffae5346fcf0fe1b2cab428fdd5b1aabebfbfb 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -5132,9 +5132,10 @@ megasas_resume(struct pci_dev *pdev)
                goto fail_ready_state;
 
        /* Now re-enable MSI-X */
-       if (instance->msix_vectors)
-               pci_enable_msix(instance->pdev, instance->msixentry,
-                               instance->msix_vectors);
+       if (instance->msix_vectors &&
+           pci_enable_msix(instance->pdev, instance->msixentry,
+                           instance->msix_vectors))
+               goto fail_reenable_msix;
 
        switch (instance->pdev->device) {
        case PCI_DEVICE_ID_LSI_FUSION:
@@ -5243,6 +5244,7 @@ fail_init_mfi:
 
 fail_set_dma_mask:
 fail_ready_state:
+fail_reenable_msix:
 
        pci_disable_device(pdev);