[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Fix uninitialized variab...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/08d4339abddb
branches:  trunk
changeset: 327872:08d4339abddb
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Mar 19 18:04:32 2014 +0000

description:
Fix uninitialized variable wait in intel_ddi_prepare_link_retrain.

Move a line around, too, to avoid merge conflicts with upstream.

Noted by maxv@.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r d494da1a75fc -r 08d4339abddb sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c   Wed Mar 19 17:48:34 2014 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c   Wed Mar 19 18:04:32 2014 +0000
@@ -1357,8 +1357,8 @@
        struct intel_dp *intel_dp = &intel_dig_port->dp;
        struct drm_i915_private *dev_priv = encoder->dev->dev_private;
        enum port port = intel_dig_port->port;
-       bool wait;
        uint32_t val;
+       bool wait = false;
 
        if (I915_READ(DP_TP_CTL(port)) & DP_TP_CTL_ENABLE) {
                val = I915_READ(DDI_BUF_CTL(port));