diff mbox series

media: omap3isp: drop graph mutex on error path

Message ID YHV0WJWNQv5I6yqO@mwanda (mailing list archive)
State Not Applicable, archived
Delegated to: Sakari Ailus
Headers
Series media: omap3isp: drop graph mutex on error path |

Commit Message

Dan Carpenter April 13, 2021, 10:37 a.m. UTC 
  Drop the "&isp->media_dev.graph_mutex" if media_entity_enum_init() fails.

Fixes: ba689d933361 ("media: omap3isp: Acquire graph mutex for graph traversal")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/media/platform/omap3isp/isp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Sakari Ailus April 21, 2021, 12:08 p.m. UTC | #1 
Hi Dan,

On Tue, Apr 13, 2021 at 01:37:12PM +0300, Dan Carpenter wrote:
> Drop the "&isp->media_dev.graph_mutex" if media_entity_enum_init() fails.
> 
> Fixes: ba689d933361 ("media: omap3isp: Acquire graph mutex for graph traversal")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Thanks for the fix.

I got another patch here earlier to fix the same bug so I've taken that
instead:

<URL:https://patchwork.linuxtv.org/project/linux-media/patch/20210407143733.1608806-1-weiyongjun1@huawei.com/>
diff mbox series

Patch

diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 53025c8c7531..20f59c59ff8a 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -2037,8 +2037,10 @@  static int isp_subdev_notifier_complete(struct v4l2_async_notifier *async)
 	mutex_lock(&isp->media_dev.graph_mutex);
 
 	ret = media_entity_enum_init(&isp->crashed, &isp->media_dev);
-	if (ret)
+	if (ret) {
+		mutex_unlock(&isp->media_dev.graph_mutex);
 		return ret;
+	}
 
 	list_for_each_entry(sd, &v4l2_dev->subdevs, list) {
 		if (sd->notifier != &isp->notifier)