Commit 40a6cead authored by Anshuman Gupta's avatar Anshuman Gupta
Browse files

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: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarAnkit Nautiyal <ankit.k.nautiyal@intel.com>
Signed-off-by: default avatarAnshuman Gupta <anshuman.gupta@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210120103032.15198-1-anshuman.gupta@intel.com
parent 7fde594f

drivers/gpu/drm/i915/display/intel_hdcp.c

+10 −10
Original line number Diff line number Diff line
@@ -878,14 +878,14 @@ 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 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;

			return 0;

	}



	hdcp->hdcp_encrypted = false;

	intel_de_write(dev_priv, HDCP_CONF(dev_priv, cpu_transcoder, port), 0);
@@ -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;

			return 0;

	}



	ret = hdcp2_disable_encryption(connector);