diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-05 18:52:27 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-05 18:52:27 +0200 |
| commit | 9514a56753a8d379db36bed424588e1842f2bfcc (patch) | |
| tree | d13cdfcd9473f521c3b108770dba57e81e557a30 /drivers/net/wireless/iwlegacy/iwl-hcmd.c | |
| parent | dt: add helper to read 64-bit integers (diff) | |
| parent | devicetree: Add ARM pl022 spi controller binding doc (diff) | |
| download | linux-9514a56753a8d379db36bed424588e1842f2bfcc.tar.xz linux-9514a56753a8d379db36bed424588e1842f2bfcc.zip | |
Merge branch 'for-grant' of git://git.jdl.com/software/linux-3.0 into devicetree/next
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 62b4b09122cb..ce1fc9feb61f 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) { |