Commit 3eb87773 authored Feb 22, 2019 by Shuah Khan Committed by Mauro Carvalho Chehab Mar 19, 2019

media: replace WARN_ON in __media_pipeline_start()



__media_pipeline_start() does WARN_ON() when active pipe doesn't
match the input arg entity's pipe.

Replace WARN_ON with a conditional and error message that includes
names of both entities.

Signed-off-by: Shuah Khan <shuah@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

parent e855165f

drivers/media/media-entity.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -435,7 +435,10 @@ __must_check int __media_pipeline_start(struct media_entity *entity,

		entity->stream_count++;

		if (WARN_ON(entity->pipe && entity->pipe != pipe)) {
		if (entity->pipe && entity->pipe != pipe) {
		pr_err("Pipe active for %s. Can't start for %s\n",
		entity->name,
		entity_err->name);
		ret = -EBUSY;
		goto error;
		}

Admin message