]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: Initialize active_outputs to never read unitialized values
authorDamien Lespiau <damien.lespiau@intel.com>
Mon, 10 Jun 2013 12:49:25 +0000 (13:49 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 10 Jun 2013 18:17:41 +0000 (20:17 +0200)
In case of intel_sdvo_get_active_outputs() failing, we end up reading a
value from the stack.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_sdvo.c

index e77ffadb17796f6ddd70f66a1b09c2a29127485d..97d3099aea239ae1568e398a8c9456fda4c0d59b 100644 (file)
@@ -1277,7 +1277,7 @@ static bool intel_sdvo_connector_get_hw_state(struct intel_connector *connector)
        struct intel_sdvo_connector *intel_sdvo_connector =
                to_intel_sdvo_connector(&connector->base);
        struct intel_sdvo *intel_sdvo = intel_attached_sdvo(&connector->base);
-       u16 active_outputs;
+       u16 active_outputs = 0;
 
        intel_sdvo_get_active_outputs(intel_sdvo, &active_outputs);
 
@@ -1293,7 +1293,7 @@ static bool intel_sdvo_get_hw_state(struct intel_encoder *encoder,
        struct drm_device *dev = encoder->base.dev;
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct intel_sdvo *intel_sdvo = to_intel_sdvo(&encoder->base);
-       u16 active_outputs;
+       u16 active_outputs = 0;
        u32 tmp;
 
        tmp = I915_READ(intel_sdvo->sdvo_reg);