From 80a1f95b8a6fe14b0c4b1f688b3a5d7170936e2c Mon Sep 17 00:00:00 2001 From: Sakari Ailus Date: Thu, 12 Apr 2018 06:16:39 -0400 Subject: 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 Signed-off-by: Mauro Carvalho Chehab --- drivers/media/i2c/ov7740.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'drivers/media/i2c/ov7740.c') diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c index cbfa5a3327f6..3dad33c6180f 100644 --- 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", -- cgit v1.2.3