media: ov7740: Fix control handler error at the end of control init

Check that no error happened during adding controls to the driver's
control handler. Print an error message and bail out if there was one.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c
index cbfa5a3327f62302e2e3144ad5419baf1853271f..3dad33c6180f941ecd7e68abc4b823c50de22152 100644 (file)
--- a/drivers/media/i2c/ov7740.c
+++ b/drivers/media/i2c/ov7740.c
@@ -1006,6 +1006,13 @@ static int ov7740_init_controls(struct ov7740 *ov7740)
                               V4L2_EXPOSURE_MANUAL, false);
        v4l2_ctrl_cluster(2, &ov7740->hflip);
 
+       if (ctrl_hdlr->error) {
+               ret = ctrl_hdlr->error;
+               dev_err(&client->dev, "controls initialisation failed (%d)\n",
+                       ret);
+               goto error;
+       }
+
        ret = v4l2_ctrl_handler_setup(ctrl_hdlr);
        if (ret) {
                dev_err(&client->dev, "%s control init failed (%d)\n",