Commit 2649c1a2 authored by Wei Chen's avatar Wei Chen Committed by Hans Verkuil
Browse files

media: hi846: Fix memleak in hi846_init_controls() 



hi846_init_controls doesn't clean the allocated ctrl_hdlr
in case there is a failure, which causes memleak. Add
v4l2_ctrl_handler_free to free the resource properly.

Fixes: e8c08826 ("media: i2c: add driver for the SK Hynix Hi-846 8M pixel camera")
Signed-off-by: default avatarWei Chen <harperchen1110@gmail.com>
Reviewed-by: default avatarMartin Kepplinger <martin.kepplinger@puri.sm>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 5a4e1b5a

drivers/media/i2c/hi846.c

+8 −3
Original line number Diff line number Diff line
@@ -1472,21 +1472,26 @@ static int hi846_init_controls(struct hi846 *hi846) 
	if (ctrl_hdlr->error) {

		dev_err(&client->dev, "v4l ctrl handler error: %d\n",

			ctrl_hdlr->error);

		return ctrl_hdlr->error;

		ret = ctrl_hdlr->error;

		goto error;

	}



	ret = v4l2_fwnode_device_parse(&client->dev, &props);

	if (ret)

		return ret;

		goto error;



	ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &hi846_ctrl_ops,

					      &props);

	if (ret)

		return ret;

		goto error;



	hi846->sd.ctrl_handler = ctrl_hdlr;



	return 0;



error:

	v4l2_ctrl_handler_free(ctrl_hdlr);

	return ret;

}



static int hi846_set_video_mode(struct hi846 *hi846, int fps)