Commit 100cf7b4 authored by Kohei Enju's avatar Kohei Enju Committed by Tony Nguyen
Browse files

ixgbe: don't initialize aci lock in ixgbe_recovery_probe() 



hw->aci.lock is already initialized in ixgbe_sw_init(), so
ixgbe_recovery_probe() doesn't need to initialize the lock. This
function is also not responsible for destroying the lock on failures.

Additionally, change the name of label in accordance with this change.

Fixes: 29cb3b8d ("ixgbe: add E610 implementation of FW recovery mode")
Reported-by: default avatarSimon Horman <horms@kernel.org>
Closes: https://lore.kernel.org/intel-wired-lan/aTcFhoH-z2btEKT-@horms.kernel.org/


Signed-off-by: default avatarKohei Enju <enjuk@amazon.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 63834471

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −4
Original line number Diff line number Diff line
@@ -11476,10 +11476,9 @@ static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter) 
		return err;



	ixgbe_get_hw_control(adapter);

	mutex_init(&hw->aci.lock);

	err = ixgbe_get_flash_data(&adapter->hw);

	if (err)

		goto shutdown_aci;

		goto err_release_hw_control;



	timer_setup(&adapter->service_timer, ixgbe_service_timer, 0);

	INIT_WORK(&adapter->service_task, ixgbe_recovery_service_task);
@@ -11502,8 +11501,7 @@ static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter) 
	devl_unlock(adapter->devlink);



	return 0;

shutdown_aci:

	mutex_destroy(&adapter->hw.aci.lock);

err_release_hw_control:

	ixgbe_release_hw_control(adapter);

	return err;

}