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: e8c0882685f9 ("media: i2c: add driver for the SK Hynix Hi-846 8M pixel camera")
Signed-off-by: Wei Chen <harperchen1110@gmail.com>
Reviewed-by: Martin Kepplinger <martin.kepplinger@puri.sm>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/i2c/hi846.c b/drivers/media/i2c/hi846.c
index 7c61873b719812c6c64bb80467bc81e72d1f9f71..306dc35e925fd00ad4943f386e15794e30542564 100644 (file)
--- a/drivers/media/i2c/hi846.c
+++ b/drivers/media/i2c/hi846.c
@@ -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)