| From 5c0a059d629b00e5497d444fa41dab8b523134fb Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Mon, 10 Jun 2013 13:49:25 +0100 |
| Subject: drm/i915: Initialize active_outputs to never read unitialized values |
| |
| 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> |
| (cherry picked from commit 2f28c50bb3881f11afee8f8c9041dad2c96653aa) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_sdvo.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c |
| index 019b0380a3d6..44609b623100 100644 |
| --- a/drivers/gpu/drm/i915/intel_sdvo.c |
| +++ b/drivers/gpu/drm/i915/intel_sdvo.c |
| @@ -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); |
| -- |
| 1.8.5.rc3 |
| |