aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lamparter <chunkeey@googlemail.com>2010-11-15 15:11:26 +0100
committerJohn W. Linville <linville@tuxdriver.com>2010-11-15 15:03:13 -0500
commitdfa31fef5dd3d204c4cdae7369f3542bd1f7e84a (patch)
tree29128ee6801b57ef5efcd4d67fd637f51e7c6d74
parent309075cf08ed92a7d2c0e22b7653c5daabbd7ad1 (diff)
downloadmrst-s0i3-test-dfa31fef5dd3d204c4cdae7369f3542bd1f7e84a.tar.gz
mrst-s0i3-test-dfa31fef5dd3d204c4cdae7369f3542bd1f7e84a.tar.xz
mrst-s0i3-test-dfa31fef5dd3d204c4cdae7369f3542bd1f7e84a.zip
carl9170: fix usb anchor wait timeout
usb_wait_anchor_empty_timeout's @timeout wants milliseconds and not jiffies. Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/carl9170/usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/carl9170/usb.c b/drivers/net/wireless/ath/carl9170/usb.c
index 3317039cd28..7504ed14c72 100644
--- a/drivers/net/wireless/ath/carl9170/usb.c
+++ b/drivers/net/wireless/ath/carl9170/usb.c
@@ -553,12 +553,12 @@ static int carl9170_usb_flush(struct ar9170 *ar)
usb_free_urb(urb);
}
- ret = usb_wait_anchor_empty_timeout(&ar->tx_cmd, HZ);
+ ret = usb_wait_anchor_empty_timeout(&ar->tx_cmd, 1000);
if (ret == 0)
err = -ETIMEDOUT;
/* lets wait a while until the tx - queues are dried out */
- ret = usb_wait_anchor_empty_timeout(&ar->tx_anch, HZ);
+ ret = usb_wait_anchor_empty_timeout(&ar->tx_anch, 1000);
if (ret == 0)
err = -ETIMEDOUT;