aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index ba78c7481fa3..0c077cfc388b 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -684,7 +684,7 @@ restore:
684int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix) 684int qlcnic_enable_msix(struct qlcnic_adapter *adapter, u32 num_msix)
685{ 685{
686 struct pci_dev *pdev = adapter->pdev; 686 struct pci_dev *pdev = adapter->pdev;
687 int err = -1, vector; 687 int err, vector;
688 688
689 if (!adapter->msix_entries) { 689 if (!adapter->msix_entries) {
690 adapter->msix_entries = kcalloc(num_msix, 690 adapter->msix_entries = kcalloc(num_msix,
@@ -706,7 +706,7 @@ enable_msix:
706 adapter->flags |= QLCNIC_MSIX_ENABLED; 706 adapter->flags |= QLCNIC_MSIX_ENABLED;
707 adapter->ahw->num_msix = num_msix; 707 adapter->ahw->num_msix = num_msix;
708 dev_info(&pdev->dev, "using msi-x interrupts\n"); 708 dev_info(&pdev->dev, "using msi-x interrupts\n");
709 return err; 709 return 0;
710 } else if (err > 0) { 710 } else if (err > 0) {
711 dev_info(&pdev->dev, 711 dev_info(&pdev->dev,
712 "Unable to allocate %d MSI-X vectors, Available vectors %d\n", 712 "Unable to allocate %d MSI-X vectors, Available vectors %d\n",
@@ -715,12 +715,12 @@ enable_msix:
715 if (qlcnic_82xx_check(adapter)) { 715 if (qlcnic_82xx_check(adapter)) {
716 num_msix = rounddown_pow_of_two(err); 716 num_msix = rounddown_pow_of_two(err);
717 if (err < QLCNIC_82XX_MINIMUM_VECTOR) 717 if (err < QLCNIC_82XX_MINIMUM_VECTOR)
718 return -EIO; 718 return -ENOSPC;
719 } else { 719 } else {
720 num_msix = rounddown_pow_of_two(err - 1); 720 num_msix = rounddown_pow_of_two(err - 1);
721 num_msix += 1; 721 num_msix += 1;
722 if (err < QLCNIC_83XX_MINIMUM_VECTOR) 722 if (err < QLCNIC_83XX_MINIMUM_VECTOR)
723 return -EIO; 723 return -ENOSPC;
724 } 724 }
725 725
726 if (qlcnic_82xx_check(adapter) && 726 if (qlcnic_82xx_check(adapter) &&
@@ -747,7 +747,7 @@ enable_msix:
747 } 747 }
748 } 748 }
749 749
750 return err; 750 return -EIO;
751} 751}
752 752
753static int qlcnic_82xx_calculate_msix_vector(struct qlcnic_adapter *adapter) 753static int qlcnic_82xx_calculate_msix_vector(struct qlcnic_adapter *adapter)