diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-27 15:47:33 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-27 15:47:33 -0400 |
| commit | a8acfd82ebefbb32f12f413019e53f9e939cf44e (patch) | |
| tree | 77ed527122c81600681eb86f2bfc9829b1af20d8 /drivers/net/wireless/iwlegacy/iwl-hcmd.c | |
| parent | d93dc5c4478c1fd5de85a3e8aece9aad7bbae044 (diff) | |
| parent | ba54238552625aad2d75f455a4d3db18ea7dec68 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlegacy/iwl-hcmd.c')
| -rw-r--r-- | drivers/net/wireless/iwlegacy/iwl-hcmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl-hcmd.c b/drivers/net/wireless/iwlegacy/iwl-hcmd.c index 62b4b09122c..ce1fc9feb61 100644 --- 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; } - 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) { |