diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-15 05:43:07 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-15 05:43:07 -0700 |
| commit | 8bf0f8bd22ceef8ac7d579e90660656d242d348c (patch) | |
| tree | f096834472068166525a8e1ad27c2af7d953ebe8 | |
| parent | 14116ab986a74e9e6d227c98d91e50032e4c09e2 (diff) | |
| parent | 8eba91adf8db1f91b5d4dd045c2a79288dd1d19c (diff) | |
Merge "msm: mdss: hdmi: fix HDCP1.4 authentication issues"
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdcp_1x.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdcp_1x.c b/drivers/video/fbdev/msm/mdss_hdcp_1x.c index 146d9303fc8b..169b474225bd 100644 --- a/drivers/video/fbdev/msm/mdss_hdcp_1x.c +++ b/drivers/video/fbdev/msm/mdss_hdcp_1x.c @@ -1349,8 +1349,10 @@ static int hdcp_1x_authentication_part2(struct hdcp_1x *hdcp) goto error; /* do not proceed further if no device connected */ - if (!hdcp->current_tp.dev_count) + if (!hdcp->current_tp.dev_count) { + rc = -EINVAL; goto error; + } rc = hdcp_1x_write_ksv_fifo(hdcp); } while (--v_retry && rc); @@ -1457,7 +1459,7 @@ static void hdcp_1x_auth_work(struct work_struct *work) goto end; } else { hdcp->hdcp_state = HDCP_STATE_AUTHENTICATED; - goto end; + goto disable_sw_ddc; } hdcp->ksv_ready = false; @@ -1466,6 +1468,7 @@ static void hdcp_1x_auth_work(struct work_struct *work) if (rc) goto end; +disable_sw_ddc: /* * Disabling software DDC before going into part3 to make sure * there is no Arbitration between software and hardware for DDC |