aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 73bba8b41831..6259619ec7e7 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -7891,7 +7891,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
7891 if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) { 7891 if (hw->eeprom.ops.validate_checksum(hw, NULL) < 0) {
7892 e_dev_err("The EEPROM Checksum Is Not Valid\n"); 7892 e_dev_err("The EEPROM Checksum Is Not Valid\n");
7893 err = -EIO; 7893 err = -EIO;
7894 goto err_eeprom; 7894 goto err_sw_init;
7895 } 7895 }
7896 7896
7897 memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len); 7897 memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
@@ -7900,7 +7900,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
7900 if (ixgbe_validate_mac_addr(netdev->perm_addr)) { 7900 if (ixgbe_validate_mac_addr(netdev->perm_addr)) {
7901 e_dev_err("invalid MAC address\n"); 7901 e_dev_err("invalid MAC address\n");
7902 err = -EIO; 7902 err = -EIO;
7903 goto err_eeprom; 7903 goto err_sw_init;
7904 } 7904 }
7905 7905
7906 setup_timer(&adapter->service_timer, &ixgbe_service_timer, 7906 setup_timer(&adapter->service_timer, &ixgbe_service_timer,
@@ -8047,7 +8047,6 @@ err_register:
8047 ixgbe_release_hw_control(adapter); 8047 ixgbe_release_hw_control(adapter);
8048 ixgbe_clear_interrupt_scheme(adapter); 8048 ixgbe_clear_interrupt_scheme(adapter);
8049err_sw_init: 8049err_sw_init:
8050err_eeprom:
8051 if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) 8050 if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
8052 ixgbe_disable_sriov(adapter); 8051 ixgbe_disable_sriov(adapter);
8053 adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP; 8052 adapter->flags2 &= ~IXGBE_FLAG2_SEARCH_FOR_SFP;