From 3115a48842ce4f62b7e9cbd6d01b7b0f6ab58a3e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 2 Nov 2011 10:17:59 -0700
Subject: [PATCH] --- yaml --- r: 275901 b: refs/heads/master c:
 b34f1f0931575bf1e1483472a5202b8247fa9b10 h: refs/heads/master i:   275899:
 d1b29a76ccdf94c95dd12afa0b224b10c8b9814a v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/i915/intel_dp.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0abd31553c38..d380305a565f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2e8b18af95358cf5407bf263cba04fc4c379123
+refs/heads/master: b34f1f0931575bf1e1483472a5202b8247fa9b10
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
index 7bdf77e79798..8c3819b02a7f 100644
--- a/trunk/drivers/gpu/drm/i915/intel_dp.c
+++ b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -1564,8 +1564,9 @@ intel_dp_set_link_train(struct intel_dp *intel_dp,
 
 	ret = intel_dp_aux_native_write(intel_dp,
 					DP_TRAINING_LANE0_SET,
-					intel_dp->train_set, 4);
-	if (ret != 4)
+					intel_dp->train_set,
+					intel_dp->lane_count);
+	if (ret != intel_dp->lane_count)
 		return false;
 
 	return true;