summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@linux.intel.com>2019-08-07 11:21:27 -0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 13:13:40 +0200
commitcab41bda0849383483b51284b8640fda43674b38 (patch)
treeefb173231868c1fba5fce2b84986ba84ed37d406
parentebe068d7bb796d7f150c8cb980cd6feab693b018 (diff)
downloadlinux-stable-cab41bda0849383483b51284b8640fda43674b38.tar.gz
linux-stable-cab41bda0849383483b51284b8640fda43674b38.tar.bz2
linux-stable-cab41bda0849383483b51284b8640fda43674b38.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>
-rw-r--r--drivers/media/platform/omap3isp/isp.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 38849f0ba09d..8a87f427c056 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;