| From d4370438c27e8ccbee972ba0e39eb4beff8afd49 Mon Sep 17 00:00:00 2001 |
| From: Akinobu Mita <akinobu.mita@gmail.com> |
| Date: Mon, 11 Mar 2019 11:36:02 -0400 |
| Subject: media: ov7670: restore default settings after power-up |
| |
| [ Upstream commit 32ab688b280301f7cee9e547564cb74e33e06322 ] |
| |
| Since commit 3d6a8fe25605 ("media: ov7670: hook s_power onto v4l2 core"), |
| the device is actually powered off while the video stream is stopped. |
| |
| The frame format and framerate are restored right after power-up, but |
| restoring the default register settings is forgotten. |
| |
| Fixes: 3d6a8fe25605 ("media: ov7670: hook s_power onto v4l2 core") |
| |
| Cc: Jonathan Corbet <corbet@lwn.net> |
| Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> |
| Reviewed-by: Lubomir Rintel <lkundrak@v3.sk> |
| Tested-by: Lubomir Rintel <lkundrak@v3.sk> |
| 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 <sashal@kernel.org> |
| --- |
| drivers/media/i2c/ov7670.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c |
| index a7d26b294eb58..e65693c2aad5f 100644 |
| --- a/drivers/media/i2c/ov7670.c |
| +++ b/drivers/media/i2c/ov7670.c |
| @@ -1664,6 +1664,7 @@ static int ov7670_s_power(struct v4l2_subdev *sd, int on) |
| |
| if (on) { |
| ov7670_power_on (sd); |
| + ov7670_init(sd, 0); |
| ov7670_apply_fmt(sd); |
| ov7675_apply_framerate(sd); |
| v4l2_ctrl_handler_setup(&info->hdl); |
| -- |
| 2.20.1 |
| |