OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c243698
)
iwl3945: re-add iwl_poll_direct_bit return value check
author
Jason Andryuk
<jandryuk@gmail.com>
Tue, 24 Feb 2009 02:45:34 +0000
(21:45 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 27 Feb 2009 19:53:04 +0000
(14:53 -0500)
Re-add the iwl_poll_direct_bit return value assignment dropped in
"iwl3945: add apm ops".
Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-3945.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/iwlwifi/iwl-3945.c
b/drivers/net/wireless/iwlwifi/iwl-3945.c
index
6ae0df5
..
0a75053
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-3945.c
@@
-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");