Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ede19bd3 authored by ziqic's avatar ziqic Committed by Michael Bestas
Browse files

msm: vidc: fix error during debugfs init 



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: default avatarziqic <quic_ziqic_01@quicinc.com>
parent 693180ee

techpack/video/msm/vidc/msm_v4l2_vidc.c

+5 −0
Original line number Diff line number Diff line
@@ -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) {

techpack/video/msm/vidc/msm_vidc.c

+2 −0
Original line number Diff line number Diff line
@@ -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);