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 6146FC433F5 for ; Fri, 15 Apr 2022 15:35:47 +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=D6sowDVB92Olj32ubJwRHfm/0DeL7kawuuPp/CKEXbw=; b=rBeov7uybcWgFe qMnAzJKM+2Y3dj/rwGV5ugfjjdcYfFsjk0nDa0C2RLHgZhg+Q3hNPmOYDI/RAaxuNHMWIbab3Lypj nedg2feya8fK9sxMYV67kIpc0Bw6XmlAJVAesotsU3XXJ7Et4YjI0upvMiRNNGzoAbDI3tCEqZlEw iv9KX9F8th6J7BifOjAcPghIn6ypGHHVqOjx1S8nzoe30wdTS5JH9HJemsVmDAZ4wh+zHuhabLNGQ kIktF0fJc1MhJwf/8REr2YDbCIWn04dXVNWeSqj83pcjssOHvOpgkxk4XhnUrKGRpljZcC5IujA3D N9Rct7m+p6dfWrAAaj9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nfNy5-00AaFP-Ff; Fri, 15 Apr 2022 15:34:42 +0000 Received: from relay4-d.mail.gandi.net ([2001:4b98:dc4:8::224]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nfNsA-00AXI9-2I for linux-arm-kernel@lists.infradead.org; Fri, 15 Apr 2022 15:28:39 +0000 Received: (Authenticated sender: paul.kocialkowski@bootlin.com) by mail.gandi.net (Postfix) with ESMTPSA id 513F0E0016; Fri, 15 Apr 2022 15:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1650036512; 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=p/G3Lv5aXmpaUoYeX8MRq+c6XCpBmVOvXeLJxUHHzd0=; b=Z3YIxE+Elv/LhefhNAdaJTccscQKVVtnBYvmQ4D5CKJUqFRnmuZqBn+A1wCUW22mlHJk/L SLq4FtjJdGO7oWtTlxjd7Fiw18nUo2VM6t9jrA3yQoUCBoZrsn1UU5gacCpBJsyk49IJFp fjLC+b/F9m8dyCHK7vCP5X315ZuXV1WM0zmIPtg8GZgR82LxVvIl7cDv2CynEg53UaK+Ns d+7r86QO76QV+PjqIgPBSqqjBb50dd+ZD+uINYJM8dLggHNOfEZsjRXc3o4cz3zlj6Flom +TKFDQ1mB5EBT407CVS4mrMzQ0PYjWrjicfqNGsylKvR+Y1aKkC1WaGyI8oQ1g== 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 v4 11/45] media: sun6i-csi: Register the media device after creation Date: Fri, 15 Apr 2022 17:27:37 +0200 Message-Id: <20220415152811.636419-12-paul.kocialkowski@bootlin.com> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220415152811.636419-1-paul.kocialkowski@bootlin.com> References: <20220415152811.636419-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-20220415_082834_323224_D4454179 X-CRM114-Status: GOOD ( 13.72 ) 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 198275e09865..e59ee3e3f372 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.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel