From 47cc6c9bb0e07a802c3895502d25599dac1c200c Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Fri, 28 Sep 2012 16:01:40 -0400
Subject: [PATCH] --- yaml --- r: 338483 b: refs/heads/master c:
 72675479925f53af051ae8a78bcfafeaa47b3eef h: refs/heads/master i:   338481:
 2c1054a282fea735c96e95f9dbf23d4e37ec234d   338479:
 96d02601c993b0bc82ef805184020a11b4ca0210 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/host/ehci-sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8697877b2ef3..77520b2f7e21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98cae42d82fe9c9e2b5dacdf391edaa007e147e5
+refs/heads/master: 72675479925f53af051ae8a78bcfafeaa47b3eef
diff --git a/trunk/drivers/usb/host/ehci-sched.c b/trunk/drivers/usb/host/ehci-sched.c
index b764cab2ab9a..e08e65d8e004 100644
--- a/trunk/drivers/usb/host/ehci-sched.c
+++ b/trunk/drivers/usb/host/ehci-sched.c
@@ -1416,7 +1416,7 @@ iso_stream_schedule (
 
 		/* Behind the scheduling threshold?  Assume URB_ISO_ASAP. */
 		if (unlikely(start < next))
-			start += period * DIV_ROUND_UP(next - start, period);
+			start += (next - start + period - 1) & (- period);
 
 		start += base;
 	}