diff options
| author | Casey Piper <cpiper@codeaurora.org> | 2015-04-15 11:18:52 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:40:54 -0700 |
| commit | ea354ea3e448668f9374ab8e21673dca2fcb3070 (patch) | |
| tree | 1e3c794e4bd6b3dd024fd5e51d559f2b96c3f257 | |
| parent | 33f539a576f561da6bc1b026ef816bda03737ed0 (diff) | |
msm: mdss: read from HDMI CEC register only if CEC enabled
If HDMI CEC is not enabled and the CEC sysfs node is
written, an unclocked register access could occur. Access
this register only if CEC is enabled and configured.
Change-Id: I1a190a8302fdf7012723fb908c661098ebabead6
Signed-off-by: Casey Piper <cpiper@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_cec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_cec.c b/drivers/video/fbdev/msm/mdss_hdmi_cec.c index 62ac686c8dad..80a15c52cb38 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_cec.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_cec.c @@ -576,8 +576,11 @@ static ssize_t hdmi_rda_cec_enable_compliance(struct device *dev, ret = snprintf(buf, PAGE_SIZE, "%d\n", cec_ctrl->compliance_response_enabled); - cec_ctrl->cec_logical_addr = 0x4; - hdmi_cec_write_logical_addr(cec_ctrl, cec_ctrl->cec_logical_addr); + if (cec_ctrl->cec_enabled && cec_ctrl->cec_engine_configed) { + cec_ctrl->cec_logical_addr = 0x4; + hdmi_cec_write_logical_addr(cec_ctrl, + cec_ctrl->cec_logical_addr); + } spin_unlock_irqrestore(&cec_ctrl->lock, flags); |