From patchwork Sun Aug 30 03:07:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 7096011 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 169F89F1B9 for ; Sun, 30 Aug 2015 03:08:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5B1CD20826 for ; Sun, 30 Aug 2015 03:08:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C08052083B for ; Sun, 30 Aug 2015 03:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753471AbbH3DI3 (ORCPT ); Sat, 29 Aug 2015 23:08:29 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:48560 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753341AbbH3DHx (ORCPT ); Sat, 29 Aug 2015 23:07:53 -0400 Received: from [179.181.112.204] (helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZVsyH-0007im-Gj; Sun, 30 Aug 2015 03:07:53 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.85) (envelope-from ) id 1ZVsxY-0004td-Nx; Sun, 30 Aug 2015 00:07:08 -0300 From: Mauro Carvalho Chehab To: Linux Media Mailing List Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab Subject: [PATCH v8 52/55] [media] media-device: remove interfaces and interface links Date: Sun, 30 Aug 2015 00:07:03 -0300 Message-Id: X-Mailer: git-send-email 2.4.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Just like what's done with entities, when the media controller is unregistered, release and interface and interface links that might still be there. Signed-off-by: Mauro Carvalho Chehab diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 638c682b79c4..2c16a46ea530 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -554,6 +554,22 @@ void media_device_unregister(struct media_device *mdev) { struct media_entity *entity; struct media_entity *next; + struct media_link *link, *tmp_link; + struct media_interface *intf, *tmp_intf; + + /* Remove interface links from the media device */ + list_for_each_entry_safe(link, tmp_link, &mdev->links, + graph_obj.list) { + media_gobj_remove(&link->graph_obj); + kfree(link); + } + + /* Remove all interfaces from the media device */ + list_for_each_entry_safe(intf, tmp_intf, &mdev->interfaces, + graph_obj.list) { + media_gobj_remove(&intf->graph_obj); + kfree(intf); + } list_for_each_entry_safe(entity, next, &mdev->entities, graph_obj.list) media_device_unregister_entity(entity); @@ -631,7 +647,6 @@ void media_device_unregister_entity(struct media_entity *entity) /* 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); } diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c index 96303a0ade59..1cdda9cb0512 100644 --- a/drivers/media/media-entity.c +++ b/drivers/media/media-entity.c @@ -206,6 +206,10 @@ void media_gobj_remove(struct media_gobj *gobj) /* Remove the object from mdev list */ list_del(&gobj->list); + + /* Links have their own list - we need to drop them there too */ + if (media_type(gobj) == MEDIA_GRAPH_LINK) + list_del(&gobj_to_link(gobj)->list); } /** diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 0e7e193a6736..7fd6265f0bcb 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -153,7 +153,7 @@ struct media_entity { }; /** - * struct media_intf_devnode - Define a Kernel API interface + * struct media_interface - Define a Kernel API interface * * @graph_obj: embedded graph object * @list: Linked list used to find other interfaces that belong @@ -163,6 +163,11 @@ struct media_entity { * uapi/media/media.h header, e. g. * MEDIA_INTF_T_* * @flags: Interface flags as defined at uapi/media/media.h + * + * NOTE: As media_device_unregister() will free the address of the + * media_interface, this structure should be embedded as the first + * element of the derivated functions, in order for the address to be + * the same. */ struct media_interface { struct media_gobj graph_obj; @@ -179,11 +184,11 @@ struct media_interface { * @minor: Minor number of a device node */ struct media_intf_devnode { - struct media_interface intf; + struct media_interface intf; /* must be first field in struct */ /* Should match the fields at media_v2_intf_devnode */ - u32 major; - u32 minor; + u32 major; + u32 minor; }; static inline u32 media_entity_id(struct media_entity *entity)