Skip to content

Commit 100cf7b

Browse files
hyperenjuanguy11
authored andcommitted
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: 29cb3b8 ("ixgbe: add E610 implementation of FW recovery mode") Reported-by: Simon Horman <horms@kernel.org> Closes: https://lore.kernel.org/intel-wired-lan/aTcFhoH-z2btEKT-@horms.kernel.org/ Signed-off-by: Kohei Enju <enjuk@amazon.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 6383447 commit 100cf7b

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11476,10 +11476,9 @@ static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter)
1147611476
return err;
1147711477

1147811478
ixgbe_get_hw_control(adapter);
11479-
mutex_init(&hw->aci.lock);
1148011479
err = ixgbe_get_flash_data(&adapter->hw);
1148111480
if (err)
11482-
goto shutdown_aci;
11481+
goto err_release_hw_control;
1148311482

1148411483
timer_setup(&adapter->service_timer, ixgbe_service_timer, 0);
1148511484
INIT_WORK(&adapter->service_task, ixgbe_recovery_service_task);
@@ -11502,8 +11501,7 @@ static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter)
1150211501
devl_unlock(adapter->devlink);
1150311502

1150411503
return 0;
11505-
shutdown_aci:
11506-
mutex_destroy(&adapter->hw.aci.lock);
11504+
err_release_hw_control:
1150711505
ixgbe_release_hw_control(adapter);
1150811506
return err;
1150911507
}

0 commit comments

Comments
 (0)