diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2019-08-07 11:21:27 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-10-05 15:11:43 +0200 |
| commit | 820e85a3821d1ec48d9a732e72d462e38b5488af (patch) | |
| tree | 769ac34ed66ff79d50348bd1fc99ce7281e01743 /drivers | |
| parent | 2418d4b41db19ed6d888338100297344e00727e3 (diff) | |
| download | linux-stable-820e85a3821d1ec48d9a732e72d462e38b5488af.tar.gz linux-stable-820e85a3821d1ec48d9a732e72d462e38b5488af.tar.bz2 linux-stable-820e85a3821d1ec48d9a732e72d462e38b5488af.zip | |
media: omap3isp: Don't set streaming state on random subdevs
[ 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 83216fc7156b..9cdb43859ae0 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -719,6 +719,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; @@ -833,6 +837,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; |