Skip to content

Commit 575fe08

Browse files
l1kjmberg-intel
authored andcommitted
wifi: iwlwifi: mld: Restart firmware on iwl_mld_no_wowlan_resume() error
Commit 4460536 ("iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled") sought to fix build breakage, but inadvertently introduced a new issue: iwl_mld_mac80211_start() no longer calls iwl_mld_start_fw() after having called iwl_mld_stop_fw() in the error path of iwl_mld_no_wowlan_resume(). Fix it. Fixes: 4460536 ("iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled") Reported-by: Miri Korenblit <[email protected]> Closes: https://lore.kernel.org/r/MW5PR11MB58106D6BC6403845C330C7AAA3A22@MW5PR11MB5810.namprd11.prod.outlook.com/ Signed-off-by: Lukas Wunner <[email protected]> Acked-by: Miri Korenblit <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Link: https://patch.msgid.link/d3ba1006a1b72ceb58c593fa62b9bd7c73e2e4ed.1744366815.git.lukas@wunner.de Signed-off-by: Johannes Berg <[email protected]>
1 parent 5f05c14 commit 575fe08

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/wireless/intel/iwlwifi/mld/mac80211.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,8 +475,8 @@ static
475475
int iwl_mld_mac80211_start(struct ieee80211_hw *hw)
476476
{
477477
struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);
478-
int ret;
479478
bool in_d3 = false;
479+
int ret = 0;
480480

481481
lockdep_assert_wiphy(mld->wiphy);
482482

@@ -501,7 +501,7 @@ int iwl_mld_mac80211_start(struct ieee80211_hw *hw)
501501
iwl_mld_restart_cleanup(mld);
502502
}
503503

504-
if (!in_d3) {
504+
if (!in_d3 || ret) {
505505
ret = iwl_mld_start_fw(mld);
506506
if (ret)
507507
goto error;

0 commit comments

Comments
 (0)