drm/i915/hdcp: Fix uninitialized symbol

Move (num_hdcp_streams > 0) condition to stream_encryption()
code block, where it actually belongs.
This fixes the static analysis error of uninitialized symbol 'ret'.

v2:
- return 0 as the return value is already checked. [Ankit]

Cc: Ramalingam C <ramalingam.c@intel.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210120103032.15198-1-anshuman.gupta@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 581ccb038b87ce706fa52b3813e438383b14b12c..ae1371c36a32d85341775169159f7cece7619cbd 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -878,15 +878,15 @@ static int _intel_hdcp_disable(struct intel_connector *connector)
                }
                drm_dbg_kms(&dev_priv->drm, "HDCP 1.4 transcoder: %s stream encryption disabled\n",
                            transcoder_name(hdcp->stream_transcoder));
+               /*
+                * If there are other connectors on this port using HDCP,
+                * don't disable it until it disabled HDCP encryption for
+                * all connectors in MST topology.
+                */
+               if (dig_port->num_hdcp_streams > 0)
+                       return 0;
        }
 
-       /*
-        * If there are other connectors on this port using HDCP, don't disable it
-        * until it disabled HDCP encryption for all connectors in MST topology.
-        */
-       if (dig_port->num_hdcp_streams > 0)
-               return ret;
-
        hdcp->hdcp_encrypted = false;
        intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0);
        if (intel_de_wait_for_clear(dev_priv,
@@ -1947,10 +1947,10 @@ static int _intel_hdcp2_disable(struct intel_connector *connector)
                }
                drm_dbg_kms(&i915->drm, "HDCP 2.2 transcoder: %s stream encryption disabled\n",
                            transcoder_name(hdcp->stream_transcoder));
-       }
 
-       if (dig_port->num_hdcp_streams > 0)
-               return ret;
+               if (dig_port->num_hdcp_streams > 0)
+                       return 0;
+       }
 
        ret = hdcp2_disable_encryption(connector);