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

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

Merge "msm: venc: Initialize all encoder V4L2 custom control to proper type"

parents 428cfe3d 434899d0

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

+1 −1
Original line number Diff line number Diff line
@@ -2081,7 +2081,7 @@ static struct v4l2_ctrl **get_cluster(int type, int *size) 
int msm_vdec_ctrl_init(struct msm_vidc_inst *inst)

{

	int idx = 0;

	struct v4l2_ctrl_config ctrl_cfg;

	struct v4l2_ctrl_config ctrl_cfg = {0};

	int ret_val = 0;



	ret_val = v4l2_ctrl_handler_init(&inst->ctrl_handler, NUM_CTRLS);

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

+1 −1
Original line number Diff line number Diff line
@@ -2730,7 +2730,7 @@ int msm_venc_ctrl_init(struct msm_vidc_inst *inst) 
{



	int idx = 0;

	struct v4l2_ctrl_config ctrl_cfg;

	struct v4l2_ctrl_config ctrl_cfg = {0};

	int ret_val = 0;

	ret_val = v4l2_ctrl_handler_init(&inst->ctrl_handler, NUM_CTRLS);

	if (ret_val) {