6.1-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sam Bobrowicz sam@elite-embedded.com
commit 001d3753538d26ddcbef011f5643cfff58a7f672 upstream.
Light frequency was not properly returned when in auto mode and the detected frequency was 60Hz.
Fixes: 19a81c1426c1 ("[media] add Omnivision OV5640 sensor driver") Cc: stable@vger.kernel.org Signed-off-by: Sam Bobrowicz sam@elite-embedded.com Signed-off-by: Michal Simek michal.simek@amd.com Signed-off-by: Sakari Ailus sakari.ailus@linux.intel.com Signed-off-by: Mauro Carvalho Chehab mchehab+huawei@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/media/i2c/ov5640.c | 1 + 1 file changed, 1 insertion(+)
--- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -1971,6 +1971,7 @@ static int ov5640_get_light_freq(struct light_freq = 50; } else { /* 60Hz */ + light_freq = 60; } }