Commit 82cd682d authored by Anton Blanchard's avatar Anton Blanchard Committed by John W. Linville

[PATCH] b43/b43legacy: jiffies_round -> jiffies_round_relative

When rounding a relative timeout we need to use round_jiffies_relative().
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b239bd75
...@@ -2391,7 +2391,7 @@ static void b43_periodic_work_handler(struct work_struct *work) ...@@ -2391,7 +2391,7 @@ static void b43_periodic_work_handler(struct work_struct *work)
if (b43_debug(dev, B43_DBG_PWORK_FAST)) if (b43_debug(dev, B43_DBG_PWORK_FAST))
delay = msecs_to_jiffies(50); delay = msecs_to_jiffies(50);
else else
delay = round_jiffies(HZ * 15); delay = round_jiffies_relative(HZ * 15);
queue_delayed_work(wl->hw->workqueue, &dev->periodic_work, delay); queue_delayed_work(wl->hw->workqueue, &dev->periodic_work, delay);
out: out:
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
......
...@@ -2260,7 +2260,7 @@ static void b43legacy_periodic_work_handler(struct work_struct *work) ...@@ -2260,7 +2260,7 @@ static void b43legacy_periodic_work_handler(struct work_struct *work)
if (b43legacy_debug(dev, B43legacy_DBG_PWORK_FAST)) if (b43legacy_debug(dev, B43legacy_DBG_PWORK_FAST))
delay = msecs_to_jiffies(50); delay = msecs_to_jiffies(50);
else else
delay = round_jiffies(HZ); delay = round_jiffies_relative(HZ);
queue_delayed_work(dev->wl->hw->workqueue, queue_delayed_work(dev->wl->hw->workqueue,
&dev->periodic_work, delay); &dev->periodic_work, delay);
out: out:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment