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-hcmd.c
diff --git
a/drivers/net/wireless/iwlegacy/iwl-hcmd.c
b/drivers/net/wireless/iwlegacy/iwl-hcmd.c
index
62b4b09
..
ce1fc9f
100644
(file)
--- a/
drivers/net/wireless/iwlegacy/iwl-hcmd.c
+++ b/
drivers/net/wireless/iwlegacy/iwl-hcmd.c
@@
-167,7
+167,7
@@
int iwl_legacy_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
goto out;
}
goto out;
}
- ret = wait_event_
interruptible_
timeout(priv->wait_command_queue,
+ ret = wait_event_timeout(priv->wait_command_queue,
!test_bit(STATUS_HCMD_ACTIVE, &priv->status),
HOST_COMPLETE_TIMEOUT);
if (!ret) {
!test_bit(STATUS_HCMD_ACTIVE, &priv->status),
HOST_COMPLETE_TIMEOUT);
if (!ret) {