Skip to contentSkip to conversation

media: omap3isp: drop graph mutex on error path

PATCH In review Dan Carpenter 2 participants 2 messages Apr 13, 2021 – Apr 21, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: omap3isp: drop graph mutex on error path

Drop the "&isp->media_dev.graph_mutex" if media_entity_enum_init() fails.

Fixes ba689d933361 ("media: omap3isp: Acquire graph mutex for graph traversal")
---
 drivers/media/platform/omap3isp/isp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/platform/omap3isp/isp.c +3 -1
index 53025c8c7531..20f59c59ff8a 100644
@@ -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)
Signature · 1 line
2.30.2
#1 lore raw

Hi Dan,

Quoted 4 lines · Dan Carpenter

Drop the "&isp->media_dev.graph_mutex" if media_entity_enum_init() fails.

Fixes ba689d933361 ("media: omap3isp: Acquire graph mutex for graph traversal")

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/[email protected]/>

Signature · 3 lines
Kind regards,

Sakari Ailus