diff options
| author | Alexander Gordeev <agordeev@redhat.com> | 2014-08-18 08:01:43 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-09-16 09:09:40 -0700 |
| commit | dd0881281d98e7d3d5e34224058a5d1389241126 (patch) | |
| tree | 0b14ad009a2f0d80d3ce9c560d47b02299816ad7 /drivers/scsi/megaraid | |
| parent | 18fce3c440c762ab4dfb6156bbd3c0beb0f67f17 (diff) | |
| download | op-kernel-dev-dd0881281d98e7d3d5e34224058a5d1389241126.zip op-kernel-dev-dd0881281d98e7d3d5e34224058a5d1389241126.tar.gz | |
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>
Diffstat (limited to 'drivers/scsi/megaraid')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 22a04e3..e4ffae5 100644 --- 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); |
