From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6BE8AC433F5 for ; Fri, 11 Mar 2022 14:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8r36icgnxlY4Yskz7ctwLQatPGrhsDio63/s8c1u3lw=; b=ZXyhpxnvn5DRmd 476FD3wc/mvxOUtCP8K2vicRLfzZymJAOxId2C+e6mSG/WBfDbEelbk/yEEXy9S2sRjpMCWSf2DR5 qe+QKYzhhdhA0OTOLvndrCSqGwXHfuhdPc9StAsSZ6PwH/AgLaJPNK7HK4dfjA5Uikf08DRPkfzNE azNUuNOGHXu11prDX9eNBy6quZJIOOD0b/4Z3DaMGU4XTM+5rj204Yc0vLUZD7GoS9Sb6BOe/ks4m RSfGMo12BPHS/eiCppNAs2x/mIpjpXw6xTtDfgkdfEJogN4RJvyBJL13ojrPURdQlBSxLK0DmvLA3 3sEzspyP5YiDoO4V1CBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSgR4-00Gpvw-U0; Fri, 11 Mar 2022 14:40:08 +0000 Received: from relay1-d.mail.gandi.net ([217.70.183.193]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nSgNF-00Gnw6-Ry for linux-arm-kernel@lists.infradead.org; Fri, 11 Mar 2022 14:36:14 +0000 Received: (Authenticated sender: paul.kocialkowski@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 36CEE240006; Fri, 11 Mar 2022 14:36:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1647009368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pEx0KTi/PkAn0HHoRLYFjHtkOB03J6H8SvSr1IBFJQw=; b=MVD4chTJZjRe+ve9BqmHAImlfQaDD+mVGgcucaCm4VqRDPOXhPVDd8U1X1SFSn292sZs7d 8wH5Zyq6St+etn7bb3T5kuls39kAp9bxLrKFUBp5Lk+E5WoWUJg8+aphCHbl6kfWQ0y7NA CBt97+zzHHg++ObPk+c/etaIDlXF3CswXtcJffDg/j2v8Ga909EvJwvo+EvrwFqaOuZ+CR tf4uEyUMJ7qub3sEJ9/Z6wY8c0yVYxcOCXEVlQ56E+hPEVDSZXExHD0PpL2C8l8CbU20Ju LAKt1fyt76c9JTVdOv2MSg+TnFm2WiBtceOq41YKC80+e0YdgV/qcAza2txxMw== From: Paul Kocialkowski To: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Cc: Yong Deng , Paul Kocialkowski , Mauro Carvalho Chehab , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Laurent Pinchart , Maxime Ripard , Thomas Petazzoni Subject: [PATCH v3 12/46] media: sun6i-csi: Register the media device after creation Date: Fri, 11 Mar 2022 15:34:58 +0100 Message-Id: <20220311143532.265091-13-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220311143532.265091-1-paul.kocialkowski@bootlin.com> References: <20220311143532.265091-1-paul.kocialkowski@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220311_063610_115142_D9DC1CF1 X-CRM114-Status: GOOD ( 13.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org There is no particular need to register the media device in the subdev notify complete callback. Register it in the v4l2 code instead where it's more in-context. Signed-off-by: Paul Kocialkowski --- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index 99b2cf5fe184..38e41e0c8a3c 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c @@ -638,7 +638,7 @@ static int sun6i_subdev_notify_complete(struct v4l2_async_notifier *notifier) if (ret < 0) return ret; - return media_device_register(&v4l2->media_dev); + return 0; } static const struct v4l2_async_notifier_operations sun6i_csi_async_ops = { @@ -687,6 +687,12 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev) media_device_init(media_dev); + ret = media_device_register(media_dev); + if (ret) { + dev_err(dev, "failed to register media device: %d\n", ret); + goto error_media; + } + /* V4L2 Control Handler */ ret = v4l2_ctrl_handler_init(&v4l2->ctrl_handler, 0); @@ -746,6 +752,7 @@ static int sun6i_csi_v4l2_setup(struct sun6i_csi_device *csi_dev) v4l2_ctrl_handler_free(&v4l2->ctrl_handler); error_media: + media_device_unregister(media_dev); media_device_cleanup(media_dev); return ret; -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel