From patchwork Sun Jun 9 19:41:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylwester Nawrocki X-Patchwork-Id: 18817 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UllVG-0003Qt-Dz; Sun, 09 Jun 2013 21:42:14 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1UllVE-0006nM-4s; Sun, 09 Jun 2013 21:42:14 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751393Ab3FITmK (ORCPT + 1 other); Sun, 9 Jun 2013 15:42:10 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:62947 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751260Ab3FITmI (ORCPT ); Sun, 9 Jun 2013 15:42:08 -0400 Received: by mail-bk0-f46.google.com with SMTP id na10so2964123bkb.5 for ; Sun, 09 Jun 2013 12:42:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=9Pp4zUAIDB82mtExz/bUHFKn3lDPS/XIOZEZZUIy5lc=; b=VPXDQ4vXSiwRKVpytcySIp924a/kZSgTx0GFtXEkLLgmXlfbgFeqsCYVii1hogBz9l edO3Ac9G6ZSen2VmP2bH7CqWozKnG0WJNeuw1GNqM2eq+KdSE0D8j94jZukexOSQMi/j 2GS+vZ0TLh5ddtkbLQHFGqNYbgz3zirpOuGKubjQwtzvNZBZfBOwIoKurZAzI0VFtuWF GwHCGJk9oTuAqPrPmMbCYoYmZEvau1O/ZvYkRMpGDHTWDpNslrazdJ5AQaiJdBLgGF6D ygSFk2KhPlx2Tbn+FUgxv5a1YYUol7mSMtAtrXZkMPZPhSeC+/ggyvW0AIWg4nWGKaxH soPg== X-Received: by 10.205.99.131 with SMTP id cs3mr1024297bkc.169.1370806927408; Sun, 09 Jun 2013 12:42:07 -0700 (PDT) Received: from localhost.localdomain (093105185086.warszawa.vectranet.pl. [93.105.185.86]) by mx.google.com with ESMTPSA id iy11sm2530515bkb.11.2013.06.09.12.42.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 09 Jun 2013 12:42:06 -0700 (PDT) From: Sylwester Nawrocki To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, sakari.ailus@iki.fi, kyungmin.park@samsung.com, sw0312.kim@samsung.com, a.hajda@samsung.com, hj210.choi@samsung.com, s.nawrocki@samsung.com Subject: [RFC PATCH v2 2/2] V4L: Remove all links of a media entity when unregistering subdev Date: Sun, 9 Jun 2013 21:41:39 +0200 Message-Id: <1370806899-17709-3-git-send-email-s.nawrocki@samsung.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1370806899-17709-1-git-send-email-s.nawrocki@samsung.com> References: <1370806899-17709-1-git-send-email-s.nawrocki@samsung.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.6.9.193020 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Remove all links of the subdev's media entity after internal_ops 'unregistered' call and right before unregistering the entity from a media device. It is assumed here that an unregistered (orphan) media entity cannot have links to other entities registered to a media device. It is also assumed the media links should be created/removed with the media graph's mutex held. The above implies that the caller of v4l2_device_unregister_subdev() must not hold the graph's mutex. Signed-off-by: Sylwester Nawrocki Reviewed-by: Andrzej Hajda Signed-off-by: Kyungmin Park --- drivers/media/v4l2-core/v4l2-device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c index 8ed5da2..2dbfebc 100644 --- a/drivers/media/v4l2-core/v4l2-device.c +++ b/drivers/media/v4l2-core/v4l2-device.c @@ -269,8 +269,10 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd) sd->v4l2_dev = NULL; #if defined(CONFIG_MEDIA_CONTROLLER) - if (v4l2_dev->mdev) + if (v4l2_dev->mdev) { + media_entity_remove_links(&sd->entity); media_device_unregister_entity(&sd->entity); + } #endif video_unregister_device(sd->devnode); module_put(sd->owner);