diff options
| author | Akinobu Mita | 2019-04-17 16:06:38 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2019-05-23 11:39:13 +0200 |
| commit | cfe7cc383cfadff6d3596296c86d7ab7487fc6f4 (patch) | |
| tree | 375780033291398a564eb094b1eb72b4ef6fb41d /drivers/media/i2c | |
| parent | media: cec-ioc-g-mode.rst: be more specific when EPERM is returned (diff) | |
| download | kernel-qcow2-linux-cfe7cc383cfadff6d3596296c86d7ab7487fc6f4.tar.gz kernel-qcow2-linux-cfe7cc383cfadff6d3596296c86d7ab7487fc6f4.tar.xz kernel-qcow2-linux-cfe7cc383cfadff6d3596296c86d7ab7487fc6f4.zip | |
media: ov7740: fix unbalanced pm_runtime_get/put
Avoid returning without decrement the usage count in s_ctrl().
Cc: Wenyou Yang <wenyou.yang@microchip.com>
Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/i2c')
| -rw-r--r-- | drivers/media/i2c/ov7740.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/i2c/ov7740.c b/drivers/media/i2c/ov7740.c index 54e80a60aa57..d122e350478c 100644 --- a/drivers/media/i2c/ov7740.c +++ b/drivers/media/i2c/ov7740.c @@ -561,16 +561,16 @@ static int ov7740_set_ctrl(struct v4l2_ctrl *ctrl) break; case V4L2_CID_AUTOGAIN: if (!ctrl->val) - return ov7740_set_gain(regmap, ov7740->gain->val); - - ret = ov7740_set_autogain(regmap, ctrl->val); + ret = ov7740_set_gain(regmap, ov7740->gain->val); + else + ret = ov7740_set_autogain(regmap, ctrl->val); break; case V4L2_CID_EXPOSURE_AUTO: if (ctrl->val == V4L2_EXPOSURE_MANUAL) - return ov7740_set_exp(regmap, ov7740->exposure->val); - - ret = ov7740_set_autoexp(regmap, ctrl->val); + ret = ov7740_set_exp(regmap, ov7740->exposure->val); + else + ret = ov7740_set_autoexp(regmap, ctrl->val); break; default: ret = -EINVAL; |