diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-15 14:06:23 -0400 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-08-16 05:53:29 -0400 |
commit | ca99d8781fd16edf4c98536a9c18e59a17b06b6c (patch) | |
tree | 22ed6721ed5fdae76d87aacbd40e6522208639b7 /drivers/gpu/drm/i915/intel_runtime_pm.c | |
parent | 1255501d8681775d564de45742c6e82b7782b7f5 (diff) |
drm/i915: Silence GCC warning for cmn_a_well
Just make the logic simple enough for even GCC to understand (and
foolproof against random changes):
drivers/gpu/drm/i915/intel_runtime_pm.c: warning: 'cmn_a_well' may be
used uninitialized in this function [-Wuninitialized]: => 871:23
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1471284383-22324-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Imre Deak <imre.deak@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_runtime_pm.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_runtime_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c index d659d6f5b8d3..a1d73c2de332 100644 --- a/drivers/gpu/drm/i915/intel_runtime_pm.c +++ b/drivers/gpu/drm/i915/intel_runtime_pm.c | |||
@@ -856,7 +856,7 @@ static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv, | |||
856 | struct i915_power_well *power_well) | 856 | struct i915_power_well *power_well) |
857 | { | 857 | { |
858 | enum skl_disp_power_wells power_well_id = power_well->data; | 858 | enum skl_disp_power_wells power_well_id = power_well->data; |
859 | struct i915_power_well *cmn_a_well; | 859 | struct i915_power_well *cmn_a_well = NULL; |
860 | 860 | ||
861 | if (power_well_id == BXT_DPIO_CMN_BC) { | 861 | if (power_well_id == BXT_DPIO_CMN_BC) { |
862 | /* | 862 | /* |
@@ -869,7 +869,7 @@ static void bxt_dpio_cmn_power_well_enable(struct drm_i915_private *dev_priv, | |||
869 | 869 | ||
870 | bxt_ddi_phy_init(dev_priv, bxt_power_well_to_phy(power_well)); | 870 | bxt_ddi_phy_init(dev_priv, bxt_power_well_to_phy(power_well)); |
871 | 871 | ||
872 | if (power_well_id == BXT_DPIO_CMN_BC) | 872 | if (cmn_a_well) |
873 | intel_power_well_put(dev_priv, cmn_a_well); | 873 | intel_power_well_put(dev_priv, cmn_a_well); |
874 | } | 874 | } |
875 | 875 | ||