This reverts commit 09ef193fef7efb0175a04634853862d717adbb95. For C3000 family of SoCs, they have four ixgbe devices sharing a single MDIO bus. ixgbe_mii_bus_init() returns -ENODEV for other three devices. The propagation of the error code makes other three ixgbe devices unregistered.
Signed-off-by: Yongxin Liu <yongxin....@windriver.com> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 2f8a4cfc5fa1..5e5223becf86 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -11031,14 +11031,10 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL, true); - err = ixgbe_mii_bus_init(hw); - if (err) - goto err_netdev; + ixgbe_mii_bus_init(hw); return 0; -err_netdev: - unregister_netdev(netdev); err_register: ixgbe_release_hw_control(adapter); ixgbe_clear_interrupt_scheme(adapter); -- 2.14.4