media: i2c: ov8856: free control handler on error in ov8856_init_controls()

The control handler wasn't freed if adding controls failed, add an error
exit label and convert the existing error return to use it.

Fixes: 879347f0c258 ("media: ov8856: Add support for OV8856 sensor")
Cc: stable@vger.kernel.org
Signed-off-by: Alexander Koskovich <akoskovich@pm.me>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c
index e2998cfa0d18a37d18ab9d05c22c570c981a8e84..dd01e1d515ff6d715de3dc4676365ad680ff4117 100644 (file)
--- a/drivers/media/i2c/ov8856.c
+++ b/drivers/media/i2c/ov8856.c
@@ -1951,12 +1951,18 @@ static int ov8856_init_controls(struct ov8856 *ov8856)
                          V4L2_CID_HFLIP, 0, 1, 1, 0);
        v4l2_ctrl_new_std(ctrl_hdlr, &ov8856_ctrl_ops,
                          V4L2_CID_VFLIP, 0, 1, 1, 0);
-       if (ctrl_hdlr->error)
-               return ctrl_hdlr->error;
+       if (ctrl_hdlr->error) {
+               ret = ctrl_hdlr->error;
+               goto err_ctrl_handler_free;
+       }
 
        ov8856->sd.ctrl_handler = ctrl_hdlr;
 
        return 0;
+
+err_ctrl_handler_free:
+       v4l2_ctrl_handler_free(ctrl_hdlr);
+       return ret;
 }
 
 static void ov8856_update_pad_format(struct ov8856 *ov8856,