media-entity: fix sparse warning in media_entity_pads_init()

PATCH New Hans Verkuil 1 participant 1 message Mar 14, 2016 Media (V4L/DVB)

lore

Share & tools

lore

Hans Verkuil

author

2016-03-14 08:21 UTC #0 lore raw

PATCH 1/1 media-entity: fix sparse warning in media_entity_pads_init()

Fix this sparse warning:

drivers/media/media-entity.c:212:5: warning: context imbalance in 'media_entity_pads_init' - different lock contexts for basic block

Signed-off-by Hans Verkuil <[email protected]>

drivers/media/media-entity.c +8 -9

index e95070b..be29d62 100644
@@ -217,20 +217,19 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
 
 	entity->num_pads = num_pads;
 	entity->pads = pads;
-
-	if (mdev)
-		spin_lock(&mdev->lock);
-
 	for (i = 0; i < num_pads; i++) {
 		pads[i].entity = entity;
 		pads[i].index = i;
-		if (mdev)
-			media_gobj_create(mdev, MEDIA_GRAPH_PAD,
-					&entity->pads[i].graph_obj);
 	}
 
-	if (mdev)
-		spin_unlock(&mdev->lock);
+	if (mdev == NULL)
+		return 0;
+
+	spin_lock(&mdev->lock);
+	for (i = 0; i < num_pads; i++)
+		media_gobj_create(mdev, MEDIA_GRAPH_PAD,
+				  &entity->pads[i].graph_obj);
+	spin_unlock(&mdev->lock);
 
 	return 0;
 }