Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d3e6c61 authored by Mohamed Abbas's avatar Mohamed Abbas Committed by John W. Linville
Browse files

iwlwifi: fix apm_stop (wrong bit polarity for FLAG_INIT_DONE) 



The patch fixes CSR_GP_CNTRL_REG_FLAG_INIT_DONE was set instead of
cleared which disabled moving device to D0U state.

Signed-off-by: default avatarMohamed Abbas <mohamed.abbas@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cf88c433

drivers/net/wireless/iwlwifi/iwl-4965.c

+2 −2
Original line number Diff line number Diff line
@@ -474,8 +474,8 @@ static void iwl4965_apm_stop(struct iwl_priv *priv) 
	iwl_set_bit(priv, CSR_RESET, CSR_RESET_REG_FLAG_SW_RESET);



	udelay(10);



	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);

	/* clear "init complete"  move adapter D0A* --> D0U state */

	iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);

	spin_unlock_irqrestore(&priv->lock, flags);

}

drivers/net/wireless/iwlwifi/iwl-5000.c

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ static void iwl5000_apm_stop(struct iwl_priv *priv) 


	udelay(10);



	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);

	/* clear "init complete"  move adapter D0A* --> D0U state */

	iwl_clear_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);



	spin_unlock_irqrestore(&priv->lock, flags);

}