]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
carl9170: fix usb anchor wait timeout
authorChristian Lamparter <chunkeey@googlemail.com>
Mon, 15 Nov 2010 14:11:26 +0000 (15:11 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 15 Nov 2010 20:03:13 +0000 (15:03 -0500)
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>
drivers/net/wireless/ath/carl9170/usb.c

index 3317039cd28fe5ae6b1e38ff0029bf345fd78d50..7504ed14c72575a7befb91b0c0d9dd2684660af9 100644 (file)
@@ -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;