Em Tue, 27 Oct 2015 01:01:32 +0200
Sakari Ailus <sakari.ailus@xxxxxx> escreveu:
> If a different entity->pipe in a pipeline was encountered, a warning was
> issued but the execution continued as if nothing had happened. Return an
> error instead right there.
>
> Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
Reviewed-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
> ---
> drivers/media/media-entity.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
> index 66b8db0..d11f440 100644
> --- a/drivers/media/media-entity.c
> +++ b/drivers/media/media-entity.c
> @@ -431,7 +431,12 @@ __must_check int media_entity_pipeline_start(struct media_entity *entity,
> DECLARE_BITMAP(has_no_links, MEDIA_ENTITY_MAX_PADS);
>
> entity->stream_count++;
> - WARN_ON(entity->pipe && entity->pipe != pipe);
> +
> + if (WARN_ON(entity->pipe && entity->pipe != pipe)) {
> + ret = -EBUSY;
> + goto error;
> + }
> +
> entity->pipe = pipe;
>
> /* Already streaming --- no need to check. */
--
Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
