| Message ID | 1445900510-1398-17-git-send-email-sakari.ailus@iki.fi (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Em Tue, 27 Oct 2015 01:01:47 +0200 Sakari Ailus <sakari.ailus@iki.fi> escreveu: > The same bug was present in the omap4iss driver as was in the omap3isp > driver. The code got copied to the omap4iss driver while broken. Fix the > omap4iss driver as well. Looks ok. > > Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> > --- > drivers/staging/media/omap4iss/iss.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c > index 076ddd4..c097fd5 100644 > --- a/drivers/staging/media/omap4iss/iss.c > +++ b/drivers/staging/media/omap4iss/iss.c > @@ -533,14 +533,14 @@ static int iss_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. */ > iss_pipeline_pm_power(source, -sink_use); > iss_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 = iss_pipeline_pm_power(source, sink_use); > if (ret < 0)
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c index 076ddd4..c097fd5 100644 --- a/drivers/staging/media/omap4iss/iss.c +++ b/drivers/staging/media/omap4iss/iss.c @@ -533,14 +533,14 @@ static int iss_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. */ iss_pipeline_pm_power(source, -sink_use); iss_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 = iss_pipeline_pm_power(source, sink_use); if (ret < 0)
The same bug was present in the omap4iss driver as was in the omap3isp driver. The code got copied to the omap4iss driver while broken. Fix the omap4iss driver as well. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> --- drivers/staging/media/omap4iss/iss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)