lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 041/542] media: ov5640: Fix check for PLL1 exceeding max allowed rate
    Date
    From: Adam Ford <aford173@gmail.com>

    [ Upstream commit 2e3df204f9af42a47823ee955c08950373417420 ]

    The variable _rate is by ov5640_compute_sys_clk() which returns
    zero if the PLL exceeds 1GHz. Unfortunately, the check to see
    if the max PLL1 output is checking 'rate' and not '_rate' and
    'rate' does not ever appear to be 0.

    This patch changes the check against the returned value of
    '_rate' to determine if the PLL1 output exceeds 1GHz.

    Fixes: aa2882481cad ("media: ov5640: Adjust the clock based on the expected rate")
    Signed-off-by: Adam Ford <aford173@gmail.com>
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/i2c/ov5640.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
    index 5e495c833d329..bb968e764f318 100644
    --- a/drivers/media/i2c/ov5640.c
    +++ b/drivers/media/i2c/ov5640.c
    @@ -874,7 +874,7 @@ static unsigned long ov5640_calc_sys_clk(struct ov5640_dev *sensor,
    * We have reached the maximum allowed PLL1 output,
    * increase sysdiv.
    */
    - if (!rate)
    + if (!_rate)
    break;

    /*
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 19:22    [W:4.087 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site