---

yaml --- r: 371155 b: refs/heads/master c: b90f517 h: refs/heads/master i: 371153: d6be062 371151: e414a1a v: v3
git-mirror · Feb 20, 2013 · 29c0b37 · 29c0b37
1 parent 1325dcb
commit 29c0b37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22b8bf17c6c1db887e3e9adb0778d6f03e621e66
+refs/heads/master: b90f517627f76640e0f6d2aa17f143dc10623a58
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -353,7 +353,8 @@ intel_dp_aux_wait_done(struct intel_dp *intel_dp, bool has_aux_irq)
 
 #define C (((status = I915_READ_NOTRACE(ch_ctl)) & DP_AUX_CH_CTL_SEND_BUSY) == 0)
 	if (has_aux_irq)
-		done = wait_event_timeout(dev_priv->gmbus_wait_queue, C, 10);
+		done = wait_event_timeout(dev_priv->gmbus_wait_queue, C,
+					  msecs_to_jiffies(10));
 	else
 		done = wait_for_atomic(C, 10) == 0;
 	if (!done)