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

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
...@@ -1472,21 +1472,26 @@ static int hi846_init_controls(struct hi846 *hi846) ...@@ -1472,21 +1472,26 @@ static int hi846_init_controls(struct hi846 *hi846)
if (ctrl_hdlr->error) { if (ctrl_hdlr->error) {
dev_err(&client->dev, "v4l ctrl handler error: %d\n", dev_err(&client->dev, "v4l ctrl handler error: %d\n",
ctrl_hdlr->error); ctrl_hdlr->error);
return ctrl_hdlr->error; ret = ctrl_hdlr->error;
goto error;
} }
ret = v4l2_fwnode_device_parse(&client->dev, &props); ret = v4l2_fwnode_device_parse(&client->dev, &props);
if (ret) if (ret)
return ret; goto error;
ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &hi846_ctrl_ops, ret = v4l2_ctrl_new_fwnode_properties(ctrl_hdlr, &hi846_ctrl_ops,
&props); &props);
if (ret) if (ret)
return ret; goto error;
hi846->sd.ctrl_handler = ctrl_hdlr; hi846->sd.ctrl_handler = ctrl_hdlr;
return 0; return 0;
error:
v4l2_ctrl_handler_free(ctrl_hdlr);
return ret;
} }
static int hi846_set_video_mode(struct hi846 *hi846, int fps) static int hi846_set_video_mode(struct hi846 *hi846, int fps)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment