From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932099AbbIJNEO (ORCPT ); Thu, 10 Sep 2015 09:04:14 -0400 Received: from lists.s-osg.org ([54.187.51.154]:35323 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751269AbbIJNDh (ORCPT ); Thu, 10 Sep 2015 09:03:37 -0400 From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Sakari Ailus , Javier Martinez Canillas , Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: [PATCH 1/2] [media] media-device: check before unregister if mdev was registered Date: Thu, 10 Sep 2015 15:03:14 +0200 Message-Id: <1441890195-11650-2-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1441890195-11650-1-git-send-email-javier@osg.samsung.com> References: <1441890195-11650-1-git-send-email-javier@osg.samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Most media functions that unregister, check if the corresponding register function succeed before. So these functions can safely be called even if a registration was never made or the component as already been unregistered. Add the same check to media_device_unregister() function for consistency. This will also allow to split the media_device_register() function in an initialization and registration functions without the need to change the generic cleanup functions and error code paths for all the media drivers. Suggested-by: Sakari Ailus Signed-off-by: Javier Martinez Canillas --- drivers/media/media-device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 1312e93ebd6e..745defb34b33 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -574,6 +574,8 @@ EXPORT_SYMBOL_GPL(__media_device_register); * media_device_unregister - unregister a media device * @mdev: The media device * + * If the media device has never been registered this function will + * return immediately. */ void media_device_unregister(struct media_device *mdev) { @@ -582,6 +584,10 @@ void media_device_unregister(struct media_device *mdev) struct media_link *link, *tmp_link; struct media_interface *intf, *tmp_intf; + /* Check if mdev was ever registered at all */ + if (!media_devnode_is_registered(&mdev->devnode)) + return; + /* Remove interface links from the media device */ list_for_each_entry_safe(link, tmp_link, &mdev->links, graph_obj.list) { -- 2.4.3