Return-path: Received: from lb1-smtp-cloud6.xs4all.net ([194.109.24.24]:46318 "EHLO lb1-smtp-cloud6.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751322AbbHaMyl (ORCPT ); Mon, 31 Aug 2015 08:54:41 -0400 Message-ID: <55E44E59.5030300@xs4all.nl> Date: Mon, 31 Aug 2015 14:53:45 +0200 From: Hans Verkuil MIME-Version: 1.0 To: Mauro Carvalho Chehab , Linux Media Mailing List CC: Mauro Carvalho Chehab Subject: Re: [PATCH v8 51/55] [media] remove interface links at media_entity_unregister() References: <36ec2d60b61f769115982c5060d550d35e3ca602.1440902901.git.mchehab@osg.samsung.com> In-Reply-To: <36ec2d60b61f769115982c5060d550d35e3ca602.1440902901.git.mchehab@osg.samsung.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org List-ID: On 08/30/2015 05:07 AM, Mauro Carvalho Chehab wrote: > Interface links connected to an entity should be removed > before being able of removing the entity. > > Signed-off-by: Mauro Carvalho Chehab > > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index a91e1ec076a6..638c682b79c4 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -618,14 +618,30 @@ void media_device_unregister_entity(struct media_entity *entity) > return; > > spin_lock(&mdev->lock); > + > + /* Remove interface links with this entity on it */ > + list_for_each_entry_safe(link, tmp, &mdev->links, graph_obj.list) { > + if (media_type(link->gobj1) == MEDIA_GRAPH_ENTITY > + && link->entity == entity) { I don't think you need the == MEDIA_GRAPH_ENTITY check here. That should always be true if link->entity == entity. > + media_gobj_remove(&link->graph_obj); > + kfree(link); > + } > + } > + > + /* Remove all data links that belong to this entity */ > list_for_each_entry_safe(link, tmp, &entity->links, list) { > media_gobj_remove(&link->graph_obj); > list_del(&link->list); > kfree(link); > } > + > + /* Remove all pads that belong to this entity */ > for (i = 0; i < entity->num_pads; i++) > media_gobj_remove(&entity->pads[i].graph_obj); > + > + /* Remove the entity */ > media_gobj_remove(&entity->graph_obj); > + > spin_unlock(&mdev->lock); > entity->graph_obj.mdev = NULL; > } > Regards, Hans