When a new link is created, we need to initialize the object inside it. Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx> diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 56724f7853bf..9fb3f8958265 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -479,6 +479,8 @@ void media_device_unregister_entity(struct media_entity *entity) graph_obj_remove(&entity->graph_obj); for (i = 0; entity->num_pads; i++) graph_obj_remove(&entity->pads[i].graph_obj); + for (i = 0; entity->num_links; i++) + graph_obj_remove(&entity->links[i].graph_obj); list_del(&entity->list); spin_unlock(&mdev->lock); entity->parent = NULL; diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index 19ad316f2f33..6985d5c53632 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -469,6 +469,10 @@ static struct media_link *media_entity_add_link(struct media_entity *entity) entity->links = links; } + /* Initialize graph object embedded at the new link */ + graph_obj_init(entity->parent, MEDIA_GRAPH_LINK, + &entity->links[entity->num_links].graph_obj); + return &entity->links[entity->num_links++]; } -- 2.4.3 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
