Commit 0ca0bcfc authored by Sakari Ailus's avatar Sakari Ailus Committed by Luis Henriques

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

commit 9d39f054 upstream.

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: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 319e98c7
...@@ -823,14 +823,14 @@ static int isp_pipeline_link_notify(struct media_link *link, u32 flags, ...@@ -823,14 +823,14 @@ static int isp_pipeline_link_notify(struct media_link *link, u32 flags,
int ret; int ret;
if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH && 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. */ /* Powering off entities is assumed to never fail. */
isp_pipeline_pm_power(source, -sink_use); isp_pipeline_pm_power(source, -sink_use);
isp_pipeline_pm_power(sink, -source_use); isp_pipeline_pm_power(sink, -source_use);
return 0; return 0;
} }
if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH && if (notification == MEDIA_DEV_NOTIFY_PRE_LINK_CH &&
(flags & MEDIA_LNK_FL_ENABLED)) { (flags & MEDIA_LNK_FL_ENABLED)) {
ret = isp_pipeline_pm_power(source, sink_use); ret = isp_pipeline_pm_power(source, sink_use);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment