From: Shuah Khan <shuah@kernel.org>
Date: Sat, 23 Feb 2019 00:17:09 +0000 (-0500)
Subject: media: replace WARN_ON in __media_pipeline_start()
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~2960^2~178
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3eb87773dee63309967b1d4d8b9896f4e4fdd640;p=mirror_ubuntu-focal-kernel.git

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>
---

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index dd859d7b235a..a998a2e0ea1d 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -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;
 		}