iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: atomisp-ov2680: Move ov2680_init_registers() call to power_up()

Browse Source 
Move ov2680_init_registers() call to power_up(), so that we also
init the registers on code-paths which do not call ov2680_s_power()
like running camorama.

Link: https://lore.kernel.org/linux-media/20211107171549.267583-6-hdegoede@redhat.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Hans de Goede 2021-11-07 17:15:43 +00:00 committed by Mauro Carvalho Chehab
parent b821cea597
commit 8eed52e182
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
View File

@ -744,9 +744,15 @@ static int power_up(struct v4l2_subdev *sd)
/* according to DS, 20ms is needed between PWDN and i2c access */ /* according to DS, 20ms is needed between PWDN and i2c access */
msleep(20); msleep(20);
ret = ov2680_init_registers(sd);
if (ret)
goto fail_init_registers;
dev->power_on = true; dev->power_on = true;
return 0; return 0;
fail_init_registers:
dev->platform_data->flisclk_ctrl(sd, 0);
fail_clk: fail_clk:
gpio_ctrl(sd, 0); gpio_ctrl(sd, 0);
fail_power: fail_power:
@ -807,8 +813,6 @@ static int ov2680_s_power(struct v4l2_subdev *sd, int on)
ret = power_down(sd); ret = power_down(sd);
} else { } else {
ret = power_up(sd); ret = power_up(sd);
if (!ret)
ret = ov2680_init_registers(sd);
} }
mutex_unlock(&dev->input_lock); mutex_unlock(&dev->input_lock);