git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' of git://github.com/tiwai/sound
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
iwlegacy
/
iwl-core.c
diff --git
a/drivers/net/wireless/iwlegacy/iwl-core.c
b/drivers/net/wireless/iwlegacy/iwl-core.c
index
35cd253
..
e5971fe
100644
(file)
--- a/
drivers/net/wireless/iwlegacy/iwl-core.c
+++ b/
drivers/net/wireless/iwlegacy/iwl-core.c
@@
-937,7
+937,7
@@
void iwl_legacy_irq_handle_error(struct iwl_priv *priv)
&priv->contexts[IWL_RXON_CTX_BSS]);
#endif
&priv->contexts[IWL_RXON_CTX_BSS]);
#endif
- wake_up
_interruptible
(&priv->wait_command_queue);
+ wake_up(&priv->wait_command_queue);
/* Keep the restart process from trying to send host
* commands by clearing the INIT status bit */
/* Keep the restart process from trying to send host
* commands by clearing the INIT status bit */
@@
-1746,7
+1746,7
@@
int iwl_legacy_force_reset(struct iwl_priv *priv, bool external)
/* Set the FW error flag -- cleared on iwl_down */
set_bit(STATUS_FW_ERROR, &priv->status);
/* Set the FW error flag -- cleared on iwl_down */
set_bit(STATUS_FW_ERROR, &priv->status);
- wake_up
_interruptible
(&priv->wait_command_queue);
+ wake_up(&priv->wait_command_queue);
/*
* Keep the restart process from trying to send host
* commands by clearing the INIT status bit
/*
* Keep the restart process from trying to send host
* commands by clearing the INIT status bit