| From 2289b536bddd4517f53294bfd18645930ad5baa6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 7 Aug 2019 11:21:27 -0300 |
| Subject: media: omap3isp: Don't set streaming state on random subdevs |
| |
| From: Sakari Ailus <sakari.ailus@linux.intel.com> |
| |
| [ Upstream commit 7ef57be07ac146e70535747797ef4aee0f06e9f9 ] |
| |
| The streaming state should be set to the first upstream sub-device only, |
| not everywhere, for a sub-device driver itself knows how to best control |
| the streaming state of its own upstream sub-devices. |
| |
| Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/media/platform/omap3isp/isp.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c |
| index c834fea5f9b00..b34b6a604f92f 100644 |
| --- a/drivers/media/platform/omap3isp/isp.c |
| +++ b/drivers/media/platform/omap3isp/isp.c |
| @@ -727,6 +727,10 @@ static int isp_pipeline_enable(struct isp_pipeline *pipe, |
| s_stream, mode); |
| pipe->do_propagation = true; |
| } |
| + |
| + /* Stop at the first external sub-device. */ |
| + if (subdev->dev != isp->dev) |
| + break; |
| } |
| |
| return 0; |
| @@ -841,6 +845,10 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe) |
| &subdev->entity); |
| failure = -ETIMEDOUT; |
| } |
| + |
| + /* Stop at the first external sub-device. */ |
| + if (subdev->dev != isp->dev) |
| + break; |
| } |
| |
| return failure; |
| -- |
| 2.20.1 |
| |
