summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_dp.c
diff options
context:
space:
mode:
authorVille Syrjälä2016-02-11 15:44:28 +0100
committerVille Syrjälä2016-02-15 18:10:41 +0100
commit22824fac947bf09959490ea7e1bed2aa7904b65f (patch)
treece4b86bd67be067d1add6a8dd6d745fee5568e0b /drivers/gpu/drm/i915/intel_dp.c
parentdrm/i915: Fix hpd live status bits for g4x (diff)
downloadkernel-qcow2-linux-22824fac947bf09959490ea7e1bed2aa7904b65f.tar.gz
kernel-qcow2-linux-22824fac947bf09959490ea7e1bed2aa7904b65f.tar.xz
kernel-qcow2-linux-22824fac947bf09959490ea7e1bed2aa7904b65f.zip
drm/i915: Add missing 'else' to intel_digital_port_connected()
intel_digital_port_connected() lacks one 'else'. There's no actual harm in not having it since each branch has an unconditional return, so it can't accidentally end up in taking two branches instead of just the one. But let's be consistent and add the 'else' anyway. Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1455201868-31527-1-git-send-email-ville.syrjala@linux.intel.com Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index afb9399ee312..a48c4290552e 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -4561,7 +4561,7 @@ bool intel_digital_port_connected(struct drm_i915_private *dev_priv,
{
if (HAS_PCH_IBX(dev_priv))
return ibx_digital_port_connected(dev_priv, port);
- if (HAS_PCH_SPLIT(dev_priv))
+ else if (HAS_PCH_SPLIT(dev_priv))
return cpt_digital_port_connected(dev_priv, port);
else if (IS_BROXTON(dev_priv))
return bxt_digital_port_connected(dev_priv, port);