---

yaml --- r: 376383 b: refs/heads/master c: e054cc3 h: refs/heads/master i: 376381: 73596c0 376379: 232df6d 376375: c9cee5b 376367: 6c537e6 376351: b3a167c 376319: 68e064d v: v3
git-mirror · May 22, 2013 · 424ab45 · 424ab45
1 parent ec0a139
commit 424ab45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2554fc1fa6dc184ca553f73e3796fa59745efa8a
+refs/heads/master: e054cc3937a4a58e77870d4c922a7b21824b610a
diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c
@@ -1003,7 +1003,7 @@ static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
 		wait_forever = false;
 	}
 
-	timeout_jiffies = timespec_to_jiffies(&wait_time);
+	timeout_jiffies = timespec_to_jiffies_timeout(&wait_time);
 
 	if (WARN_ON(!ring->irq_get(ring)))
 		return -ENODEV;