diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-21 07:30:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-21 07:30:02 -0800 |
| commit | 9b7d23b9f9e1e2870393404ec2560c6ff5ceb8f6 (patch) | |
| tree | 8b4dea1ec1d60e16be11b170e9aa82d2d73f14f7 /drivers/misc | |
| parent | f5d6d717278ad2e195d5e2b45653bd42194b0f06 (diff) | |
| parent | 26df7153d6d39f07068d670d5cad2988c2306925 (diff) | |
Merge "msm: mdss: hdcp_1x: do not fail if no cp_irq for R0"
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/hdcp.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/misc/hdcp.c b/drivers/misc/hdcp.c index 011d5bd88d90..efb987b4a6b6 100644 --- a/drivers/misc/hdcp.c +++ b/drivers/misc/hdcp.c @@ -558,6 +558,7 @@ static int hdcp_lib_txmtr_init_legacy(struct hdcp_lib_handle *handle); static struct qseecom_handle *hdcp1_handle; static bool hdcp1_supported = true; +static bool hdcp1_enc_enabled; static const char *hdcp_lib_message_name(int msg_id) { @@ -2278,6 +2279,11 @@ int hdcp1_set_enc(bool enable) if (!hdcp1_supported || !hdcp1_handle) return -EINVAL; + if (hdcp1_enc_enabled == enable) { + pr_debug("already %s\n", enable ? "enabled" : "disabled"); + return rc; + } + /* set keys and request aksv */ set_enc_req = (struct hdcp1_set_enc_req *)hdcp1_handle->sbuf; set_enc_req->commandid = HDCP1_SET_ENC_MESSAGE_ID; @@ -2302,7 +2308,8 @@ int hdcp1_set_enc(bool enable) return -EINVAL; } - pr_debug("success\n"); + hdcp1_enc_enabled = enable; + pr_debug("%s success\n", enable ? "enable" : "disable"); return 0; } |