Skip to contentSkip to conversation

iwl3945: re-add iwl_poll_direct_bit return value check

PATCH In review Jason Andryuk 1 participant 2 messages Feb 24, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iwl3945: re-add iwl_poll_direct_bit return value check

Re-add the iwl_poll_direct_bit return value assignment dropped in Commit 3fdd4102abceb4c99c5091674047b5c61fd3ebba "iwl3945: add apm ops".

--

drivers/net/wireless/iwlwifi/iwl-3945.c +1 -1
index 6ae0df5..0a75053 100644
@@ -1073,7 +1073,7 @@ static int iwl3945_apm_init(struct iwl_priv *priv)
 	* D0U* --> D0A* state */
 	iwl_set_bit(priv, CSR_GP_CNTRL, CSR_GP_CNTRL_REG_FLAG_INIT_DONE);
 
-	iwl_poll_direct_bit(priv, CSR_GP_CNTRL,
+	ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,
 			    CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY, 25000);
 	if (ret < 0) {
 		IWL_DEBUG_INFO(priv, "Failed to init the card\n");
#1 lore raw
Quoted 5 lines · Jason Andryuk

Re-add the iwl_poll_direct_bit return value assignment dropped in Commit 3fdd4102abceb4c99c5091674047b5c61fd3ebba "iwl3945: add apm ops".

--

grep iwl_poll_direct_bit drivers/net/wireless/iwlwifi/*3945*.c
drivers/net/wireless/iwlwifi/iwl-3945.c: ret = iwl_poll_direct_bit(priv, CSR_GP_CNTRL,
drivers/net/wireless/iwlwifi/iwl-3945.c: iwl_poll_direct_bit(priv, FH39_TSSR_TX_STATUS,
drivers/net/wireless/iwlwifi/iwl-3945.c: iwl_poll_direct_bit(priv, CSR_RESET,
drivers/net/wireless/iwlwifi/iwl-3945.c: iwl_poll_direct_bit(priv, CSR_GP_CNTRL,
drivers/net/wireless/iwlwifi/iwl-3945.c: rc = iwl_poll_direct_bit(priv, FH39_RSSR_STATUS,

Including this patch, only two out of five return values are checked. It isn't clear to me how errors should be handled in all cases, so a maintainer should probably take a look at these.

Jason