summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/display/intel_hdcp.c
diff options
context:
space:
mode:
authorAnshuman Gupta <anshuman.gupta@intel.com>2021-03-19 15:32:08 +0530
committerAnshuman Gupta <anshuman.gupta@intel.com>2021-03-22 12:22:09 +0530
commit3a913fa535c185d017625b352a32d1643d1f489e (patch)
tree3284acc51d4ed35cdd21adbf965a0931b63677d2 /drivers/gpu/drm/i915/display/intel_hdcp.c
parent8b06f6d8b4d98d2d379effa20d36fe097e179ccf (diff)
downloadlinux-3a913fa535c185d017625b352a32d1643d1f489e.tar.gz
linux-3a913fa535c185d017625b352a32d1643d1f489e.tar.bz2
linux-3a913fa535c185d017625b352a32d1643d1f489e.zip
drm/i915/hdcp: return correct error code
hdcp2_enable_stream_encryption shouldn't get called in case of any port authentication or encryption error, though hdcp2_enable_stream_encryption checks for link encryption before enabling stream encryption and returns error but this return error code won't be correct in case of any error due to port authentication and encryption. Cc: Ramalingam C <ramalingam.c@intel.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/20210319100208.5886-4-anshuman.gupta@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_hdcp.c')
-rw-r--r--drivers/gpu/drm/i915/display/intel_hdcp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c
index 77650677ba6f..9248536e4906 100644
--- a/drivers/gpu/drm/i915/display/intel_hdcp.c
+++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
@@ -1911,7 +1911,8 @@ static int hdcp2_authenticate_and_encrypt(struct intel_connector *connector)
}
}
- ret = hdcp2_enable_stream_encryption(connector);
+ if (!ret)
+ ret = hdcp2_enable_stream_encryption(connector);
return ret;
}