lkml.org 
[lkml]   [2019]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 51/95] media: ov5640: fix wrong binning value in exposure calculation
    Date
    From: Hugues Fruchet <hugues.fruchet@st.com>

    [ Upstream commit c2c3f42df4dd9bb231d756bacb0c897f662c6d3c ]

    ov5640_set_mode_exposure_calc() is checking binning value but
    binning value read is buggy, fix this.
    Rename ov5640_binning_on() to ov5640_get_binning() as per other
    similar functions.

    Signed-off-by: Hugues Fruchet <hugues.fruchet@st.com>
    Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
    Reviewed-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: Sasha Levin <alexander.levin@microsoft.com>
    ---
    drivers/media/i2c/ov5640.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
    index 39a2269c0bee..0366c8dc6ecf 100644
    --- a/drivers/media/i2c/ov5640.c
    +++ b/drivers/media/i2c/ov5640.c
    @@ -1216,7 +1216,7 @@ static int ov5640_set_ae_target(struct ov5640_dev *sensor, int target)
    return ov5640_write_reg(sensor, OV5640_REG_AEC_CTRL1F, fast_low);
    }

    -static int ov5640_binning_on(struct ov5640_dev *sensor)
    +static int ov5640_get_binning(struct ov5640_dev *sensor)
    {
    u8 temp;
    int ret;
    @@ -1224,8 +1224,8 @@ static int ov5640_binning_on(struct ov5640_dev *sensor)
    ret = ov5640_read_reg(sensor, OV5640_REG_TIMING_TC_REG21, &temp);
    if (ret)
    return ret;
    - temp &= 0xfe;
    - return temp ? 1 : 0;
    +
    + return temp & BIT(0);
    }

    static int ov5640_set_virtual_channel(struct ov5640_dev *sensor)
    @@ -1293,7 +1293,7 @@ static int ov5640_set_mode_exposure_calc(
    if (ret < 0)
    return ret;
    prev_shutter = ret;
    - ret = ov5640_binning_on(sensor);
    + ret = ov5640_get_binning(sensor);
    if (ret < 0)
    return ret;
    if (ret && mode->id != OV5640_MODE_720P_1280_720 &&
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-05-07 07:52    [W:5.985 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site