diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-09-25 20:52:54 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-09-25 20:52:54 -0700 |
| commit | b56464c7cb37be7ddd498ccff8cc11124cea39e6 (patch) | |
| tree | d0df17419bf1162417844fd7d3522662522cfed7 | |
| parent | d9918fae67ffde70709784781a6ad09dd86e5a82 (diff) | |
| parent | 2ee560a95542196a2358ad38a284d7dca93681f8 (diff) | |
Merge "drm/msm: fix zero device count HDCP repeater test cases"
| -rw-r--r-- | drivers/gpu/drm/msm/sde_hdcp_1x.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/sde_hdcp_1x.c b/drivers/gpu/drm/msm/sde_hdcp_1x.c index d08cf13c448d..c2d29a084c7f 100644 --- a/drivers/gpu/drm/msm/sde_hdcp_1x.c +++ b/drivers/gpu/drm/msm/sde_hdcp_1x.c @@ -1201,9 +1201,16 @@ static int sde_hdcp_1x_authentication_part2(struct sde_hdcp_1x *hdcp) if (rc) goto error; - /* do not proceed further if no device connected */ - if (!hdcp->current_tp.dev_count) + /* + * Do not proceed further if no device connected + * If no downstream devices are attached to the repeater + * then part II fails. + */ + + if (!hdcp->current_tp.dev_count) { + rc = -EINVAL; goto error; + } rc = sde_hdcp_1x_write_ksv_fifo(hdcp); } while (--v_retry && rc); |