diff options
| author | Sakari Ailus <sakari.ailus@iki.fi> | 2015-06-12 20:06:23 -0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-09-28 10:21:30 +0100 |
| commit | 0ca0bcfcfe1c84dc83e47324677add51e7b46ced (patch) | |
| tree | 70c807dc3c41520b52ba802729fe62e76d18129a | |
| parent | 319e98c7b06b67d7005911d47949bfbc1be4eaaf (diff) | |
| download | linux-stable-0ca0bcfcfe1c84dc83e47324677add51e7b46ced.tar.gz linux-stable-0ca0bcfcfe1c84dc83e47324677add51e7b46ced.tar.bz2 linux-stable-0ca0bcfcfe1c84dc83e47324677add51e7b46ced.zip | |
[media] v4l: omap3isp: Fix sub-device power management code
commit 9d39f05490115bf145e5ea03c0b7ec9d3d015b01 upstream.
Commit 813f5c0ac5cc ("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: 813f5c0ac5cc [media] media: Change media device link_notify behaviour
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 2c7aa6720569..1cc8e219298d 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -823,14 +823,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); |