diff options
| author | Abdulla Anam <abdullahanam@codeaurora.org> | 2017-03-16 15:41:43 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-09 02:13:50 -0700 |
| commit | e0435f247bb8d5fc6ee3e3a935a4db44fb8789de (patch) | |
| tree | 19df2b826040426819d8776336050a4351f09fd3 | |
| parent | 3d82d66409abb91539bcb9d1f343fcb9d583f2b4 (diff) | |
msm: vidc: Check presence of property before calling cx register
Check presence of cx-ipeak-data property before calling cx ipeak
register. cx-ipeak-driver module can be enabled for unusupported
targets as well.
Change-Id: Ieb9b3b1981a161244888c6500e472afc1ebce758
Signed-off-by: Abdulla Anam <abdullahanam@codeaurora.org>
| -rw-r--r-- | drivers/media/platform/msm/vidc/msm_vidc_res_parse.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c index 4cc977e568ee..59783dc87e5b 100644 --- a/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c +++ b/drivers/media/platform/msm/vidc/msm_vidc_res_parse.c @@ -1137,8 +1137,11 @@ int read_platform_resources_from_dt( "qcom,max-secure-instances", &res->max_secure_inst_count); - res->cx_ipeak_context = cx_ipeak_register(pdev->dev.of_node, - "qcom,cx-ipeak-data"); + if (of_find_property(pdev->dev.of_node, + "qcom,cx-ipeak-data", NULL)) { + res->cx_ipeak_context = cx_ipeak_register( + pdev->dev.of_node, "qcom,cx-ipeak-data"); + } if (IS_ERR(res->cx_ipeak_context)) { rc = PTR_ERR(res->cx_ipeak_context); |