]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
media: ov5640: Fix check for PLL1 exceeding max allowed rate
authorAdam Ford <aford173@gmail.com>
Tue, 29 Oct 2019 12:42:11 +0000 (13:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Feb 2020 07:36:25 +0000 (08:36 +0100)
commitecb8ea6f93e546d9d0f9a4b936ca8067af23dffc
treedbeaf775feaa06c0e7a60722b6a998560b7c3d87
parent9c76a7b28edc59ddcd25961889eb6f6a4968a5c2
media: ov5640: Fix check for PLL1 exceeding max allowed rate

[ 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