diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:38 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:38 -0400 |
| commit | e9dd2561793c05d70c9df1bc16a2dde6f23388df (patch) | |
| tree | 20099972569cc0748133a6351600fff9cbb15f4a /drivers/net/wireless | |
| parent | d011e151bc5d1a581bf35b492a4fde44d30382b9 (diff) | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ipw2200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 16cfd907e715..133666d43d7e 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
| @@ -1170,7 +1170,7 @@ static int ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd) | |||
| 1170 | HOST_COMPLETE_TIMEOUT); | 1170 | HOST_COMPLETE_TIMEOUT); |
| 1171 | if (rc == 0) { | 1171 | if (rc == 0) { |
| 1172 | IPW_DEBUG_INFO("Command completion failed out after %dms.\n", | 1172 | IPW_DEBUG_INFO("Command completion failed out after %dms.\n", |
| 1173 | HOST_COMPLETE_TIMEOUT / (HZ / 1000)); | 1173 | jiffies_to_msecs(HOST_COMPLETE_TIMEOUT)); |
| 1174 | priv->status &= ~STATUS_HCMD_ACTIVE; | 1174 | priv->status &= ~STATUS_HCMD_ACTIVE; |
| 1175 | return -EIO; | 1175 | return -EIO; |
| 1176 | } | 1176 | } |