Commit 9d39f054 authored Jun 12, 2015 by Sakari Ailus Committed by Mauro Carvalho Chehab Jul 06, 2015

[media] v4l: omap3isp: Fix sub-device power management code



Commit 813f5c0a ("media: Change media device link_notify behaviour")
modified the media controller link setup notification API and updated the
OMAP3 ISP driver accordingly. As a side effect it introduced a bug by
turning power on after setting the link instead of before. This results in
sub-devices not being powered down in some cases when they should be. Fix
it.

Fixes: 813f5c0a [media] media: Change media device link_notify behaviour

Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Cc: stable@vger.kernel.org # since v3.10
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent 5d479386

drivers/media/platform/omap3isp/isp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -829,14 +829,14 @@ static int isp_pipeline_link_notify(struct media_link *link, u32 flags,
		int ret;

		if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH &&
		!(link->flags & MEDIA_LNK_FL_ENABLED)) {
		!(flags & MEDIA_LNK_FL_ENABLED)) {
		/* Powering off entities is assumed to never fail. */
		isp_pipeline_pm_power(source, -sink_use);
		isp_pipeline_pm_power(sink, -source_use);
		return 0;
		}

		if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH &&
		if (notification == MEDIA_DEV_NOTIFY_PRE_LINK_CH &&
		(flags & MEDIA_LNK_FL_ENABLED)) {

		ret = isp_pipeline_pm_power(source, sink_use);