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

Commit 62a8ead9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Add NULL pointer check before deiniting controls"

parents d243db38 75d5273d

drivers/media/platform/msm/vidc/msm_vdec.c

+5 −0
Original line number Diff line number Diff line
@@ -2223,6 +2223,11 @@ int msm_vdec_ctrl_init(struct msm_vidc_inst *inst) 


int msm_vdec_ctrl_deinit(struct msm_vidc_inst *inst)

{

	if (!inst) {

		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);

		return -EINVAL;

	}



	kfree(inst->ctrls);

	kfree(inst->cluster);

	v4l2_ctrl_handler_free(&inst->ctrl_handler);

drivers/media/platform/msm/vidc/msm_venc.c

+5 −0
Original line number Diff line number Diff line
@@ -3339,6 +3339,11 @@ int msm_venc_ctrl_init(struct msm_vidc_inst *inst) 


int msm_venc_ctrl_deinit(struct msm_vidc_inst *inst)

{

	if (!inst) {

		dprintk(VIDC_ERR, "%s invalid parameters\n", __func__);

		return -EINVAL;

	}



	kfree(inst->ctrls);

	kfree(inst->cluster);

	v4l2_ctrl_handler_free(&inst->ctrl_handler);