diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-10-29 05:48:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-29 05:48:00 -0400 |
| commit | 3830de73000c07b2cbdf8cc31a46a01dda28c5df (patch) | |
| tree | 97633f920fa275a73f735b3eab0ad7728c44fdd1 /drivers/net/wireless/b43/main.c | |
| parent | 2a6f4e4983918b18fe5d3fb364afe33db7139870 (diff) | |
| parent | 6ef89d0afabe472dd17caff85cec2f9cefeb5f06 (diff) | |
Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 9d9ff76a9bc6..5058e60e5703 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2391,7 +2391,7 @@ out_requeue: if (b43_debug(dev, B43_DBG_PWORK_FAST)) delay = msecs_to_jiffies(50); else - delay = round_jiffies(HZ * 15); + delay = round_jiffies_relative(HZ * 15); queue_delayed_work(wl->hw->workqueue, &dev->periodic_work, delay); out: mutex_unlock(&wl->mutex); |