media: ov5640: fix auto controls values when switching to manual mode

When switching from auto to manual mode, V4L2 core is calling
g_volatile_ctrl() in manual mode in order to get the manual initial value.
Remove the manual mode check/return to not break this behaviour.

Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
Tested-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sam Bobrowicz <sam@elite-embedded.com>

diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index 41182564ad5514394a2c2b4109ebd76fb9fb467d..61ae9a8ca3be2e7308e3ceb935643ac92b4dc745 100644 (file)
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -2334,16 +2334,12 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
 
        switch (ctrl->id) {
        case V4L2_CID_AUTOGAIN:
-               if (!ctrl->val)
-                       return 0;
                val = ov5640_get_gain(sensor);
                if (val < 0)
                        return val;
                sensor->ctrls.gain->val = val;
                break;
        case V4L2_CID_EXPOSURE_AUTO:
-               if (ctrl->val == V4L2_EXPOSURE_MANUAL)
-                       return 0;
                val = ov5640_get_exposure(sensor);
                if (val < 0)
                        return val;