UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Alexander Gordeev 2014-08-18 08:01:43 +02:00 committed by Christoph Hellwig
parent 18fce3c440
commit dd0881281d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/scsi/megaraid/megaraid_sas_base.c
View File

@ -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);