The patch titled
usb ohci: fix 2 timers to fire at jiffies + 1s
has been removed from the -mm tree. Its filename was
usb-ohci-fix-2-timers-to-fire-at-jiffies-1s.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: usb ohci: fix 2 timers to fire at jiffies + 1s
From: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
Code inspection discovered in 2 places timers were being incorrectly setup
using round_jiffies_relative(HZ). The timer would then fire at time (0 <= T <
HZ).
Fix them to use round_jiffies(jiffies + HZ);
Signed-off-by: Richard Kennedy <richard@xxxxxxxxxxxxxxx>
Cc: Greg Kroah-Hartman <gregkh@xxxxxxx>
Cc: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/usb/host/ohci-hcd.c | 2 +-
drivers/usb/host/ohci-q.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/usb/host/ohci-hcd.c~usb-ohci-fix-2-timers-to-fire-at-jiffies-1s drivers/usb/host/ohci-hcd.c
--- a/drivers/usb/host/ohci-hcd.c~usb-ohci-fix-2-timers-to-fire-at-jiffies-1s
+++ a/drivers/usb/host/ohci-hcd.c
@@ -467,7 +467,7 @@ static void unlink_watchdog_func(unsigne
out:
kfree(seen);
if (ohci->eds_scheduled)
- mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ));
+ mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));
done:
spin_unlock_irqrestore(&ohci->lock, flags);
}
diff -puN drivers/usb/host/ohci-q.c~usb-ohci-fix-2-timers-to-fire-at-jiffies-1s drivers/usb/host/ohci-q.c
--- a/drivers/usb/host/ohci-q.c~usb-ohci-fix-2-timers-to-fire-at-jiffies-1s
+++ a/drivers/usb/host/ohci-q.c
@@ -169,7 +169,7 @@ static int ed_schedule (struct ohci_hcd
if (quirk_zfmicro(ohci)
&& (ed->type == PIPE_INTERRUPT)
&& !(ohci->eds_scheduled++))
- mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ));
+ mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));
wmb ();
/* we care about rm_list when setting CLE/BLE in case the HC was at
_
Patches currently in -mm which might be from richard@xxxxxxxxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
