summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-11-09 01:36:44 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-11-09 01:36:44 -0800
commit7e7ffb74358336d89bb09fe408b46e4f81817182 (patch)
treeee4ecd86124cfbd82e9df63b11087b03118747b2
parentdc27c14f6b6c4a52644ff49330c6027c0d2f99f6 (diff)
parente1113aa7b275bbeb2c8608e7e8ff82b9c775976b (diff)
Merge "cec: Fix runtime BUG when (CONFIG_RC_CORE && !CEC_CAP_RC)"
-rw-r--r--drivers/media/cec/cec-core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/cec/cec-core.c b/drivers/media/cec/cec-core.c
index 61adc28ec8ec..ef80af1f7e5a 100644
--- a/drivers/media/cec/cec-core.c
+++ b/drivers/media/cec/cec-core.c
@@ -305,8 +305,8 @@ int cec_register_adapter(struct cec_adapter *adap,
adap->devnode.dev.parent = parent;
#if IS_REACHABLE(CONFIG_RC_CORE)
- adap->rc->dev.parent = parent;
if (adap->capabilities & CEC_CAP_RC) {
+ adap->rc->dev.parent = parent;
res = rc_register_device(adap->rc);
if (res) {