asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: vidc: fix error during debugfs init

Browse source 
When CONFIG_DEBUG_FS is disabled, the call to
debugfs_create_dir will result in an error.

Add a check of the config to avoid the error.

Change-Id: I7a79dbc5c4c5e1e3192a11d55ad9b7994788f30f
Signed-off-by: ziqic <quic_ziqic_01@quicinc.com>
This commit is contained in:
ziqic 2022-09-23 13:57:16 +08:00 committed by Michael Bestas
parent 693180eebb
commit ede19bd3c1
No known key found for this signature in database
GPG key ID: CC95044519BE6669
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
techpack/video/msm/vidc/msm_v4l2_vidc.c
View file

@ -584,8 +584,10 @@ static int msm_vidc_probe_vidc_device(struct platform_device *pdev)
list_add_tail(&core->list, &vidc_driver->cores);
mutex_unlock(&vidc_driver->lock);
#ifdef CONFIG_DEBUG_FS
core->debugfs_root = msm_vidc_debugfs_init_core(
core, vidc_driver->debugfs_root);
#endif
vidc_driver->sku_version = core->resources.sku_version;
@ -784,9 +786,12 @@ static int __init msm_vidc_init(void)
INIT_LIST_HEAD(&vidc_driver->cores);
mutex_init(&vidc_driver->lock);
#ifdef CONFIG_DEBUG_FS
vidc_driver->debugfs_root = msm_vidc_debugfs_init_drv();
if (!vidc_driver->debugfs_root)
d_vpr_e("Failed to create debugfs for msm_vidc\n");
#endif
rc = platform_driver_register(&msm_vidc_driver);
if (rc) {

2
techpack/video/msm/vidc/msm_vidc.c
View file

@ -1543,8 +1543,10 @@ void *msm_vidc_open(int core_id, int session_type)
msm_comm_scale_clocks_and_bus(inst, 1);
#ifdef CONFIG_DEBUG_FS
inst->debugfs_root =
msm_vidc_debugfs_init_inst(inst, core->debugfs_root);
#endif
if (inst->session_type == MSM_VIDC_CVP) {
rc = msm_comm_try_state(inst, MSM_VIDC_OPEN_DONE);