aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiranjeevi Rapolu <[email protected]>2017-09-01 19:08:31 -0300
committerMauro Carvalho Chehab <[email protected]>2017-10-04 17:09:47 -0300
commit3eefbc69bbdc7bca8c3751e525902d779ca1cdd3 (patch)
treef828ca7241f3455d9e2116816d79379cb3de79ed
parent1a58fbf5133c0c016decfa85f20b97a69672e315 (diff)
[media] media: ov5670: Fix not streaming issue after resume
Previously, the sensor was not streaming after resume from suspend, i.e. on S0->S3->S0 transition. Due to this, camera app preview appeared as stuck. Now, handle streaming state correctly in case of suspend-resume. Signed-off-by: Chiranjeevi Rapolu <[email protected]> Signed-off-by: Sakari Ailus <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
-rw-r--r--drivers/media/i2c/ov5670.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/i2c/ov5670.c b/drivers/media/i2c/ov5670.c
index 759ca6229db9..a65469f88e36 100644
--- a/drivers/media/i2c/ov5670.c
+++ b/drivers/media/i2c/ov5670.c
@@ -2341,8 +2341,6 @@ static int ov5670_start_streaming(struct ov5670 *ov5670)
return ret;
}
- ov5670->streaming = true;
-
return 0;
}
@@ -2356,8 +2354,6 @@ static int ov5670_stop_streaming(struct ov5670 *ov5670)
if (ret)
dev_err(&client->dev, "%s failed to set stream\n", __func__);
- ov5670->streaming = false;
-
/* Return success even if it was an error, as there is nothing the
* caller can do about it.
*/
@@ -2388,6 +2384,7 @@ static int ov5670_set_stream(struct v4l2_subdev *sd, int enable)
ret = ov5670_stop_streaming(ov5670);
pm_runtime_put(&client->dev);
}
+ ov5670->streaming = enable;
goto unlock_and_return;
error: