From patchwork Thu Jun 30 23:06:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12902448 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 912E8C43334 for ; Fri, 1 Jul 2022 00:16:14 +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=IRUyltmKaZc9A4FleULEc5lLai8fLZTg8fFD/r2JyDA=; b=0YRaWWTE4TBfGn 3VFlK3Hb7jOkfRPSnwRBSo9i7rP8bWr8oLuGtSNJur6xCeoqfzixmSKoBh4rYJnDheOyOnDyIVTSA Q7JNINLhYOgYq9KSjJvNuKk+dVuHJrrt4fX3KaryBUyDWRmaM7t7P5YCNwP2DibrUlalu+s1Opso0 6yPm/goxLSK+ZDo//7NH+gkIn0JcATT5BVCuJAV/e8IPPOiJyKeNG8UbaSzSyNpjw9S+yIvKcVhfM VqtrebM226nbNTX0nU7BJdQw6wnXsd6MUCJbFf8SupG/EXr/3eV9Sm2OBb/aXCziv3NVZzFeZpwt8 aF3qIVf9cTpmkCC8cdkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o74KB-0028IL-RT; Fri, 01 Jul 2022 00:15:55 +0000 Received: from perceval.ideasonboard.com ([213.167.242.64]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o73GG-0020C5-6S for linux-rockchip@lists.infradead.org; Thu, 30 Jun 2022 23:07:52 +0000 Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 14823A1C; Fri, 1 Jul 2022 01:07:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1656630461; bh=kGQZja7ZZwMjQyQxHmJ3f6AqiIzFreJnuREcxnU0Xfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qFFuQClqpfH3dos/gWWaiSjGV2M8G83RmEg+vpo3JvuDpFFHAocdTMgHtR4ISFj+H gkrEPsWCHo8tleyEqXAqmEsqZaUOHP5pXR1viJk6N5KXjcc9HoPFJIecHioLkFVY9N JevXBH4mEKGCnm6x8OlDGCrbnqzjplVHJiiGoKm0= From: Laurent Pinchart To: linux-media@vger.kernel.org Cc: linux-rockchip@lists.infradead.org, Dafna Hirschfeld , Heiko Stuebner , Helen Koike , Paul Elder Subject: [PATCH v2 06/55] media: rkisp1: Disable runtime PM in probe error path Date: Fri, 1 Jul 2022 02:06:24 +0300 Message-Id: <20220630230713.10580-7-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> References: <20220630230713.10580-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220630_160748_434080_80B811D2 X-CRM114-Status: UNSURE ( 8.75 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org If the v4l2_device_register() call fails, runtime PM is left enabled. Fix it. Signed-off-by: Laurent Pinchart Reviewed-by: Dafna Hirschfeld Reviewed-by: Paul Elder --- drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c index 97d569968285..248f0172ca62 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -523,7 +523,7 @@ static int rkisp1_probe(struct platform_device *pdev) ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev); if (ret) - return ret; + goto err_pm_runtime_disable; ret = media_device_register(&rkisp1->media_dev); if (ret) { @@ -543,6 +543,7 @@ static int rkisp1_probe(struct platform_device *pdev) media_device_unregister(&rkisp1->media_dev); err_unreg_v4l2_dev: v4l2_device_unregister(&rkisp1->v4l2_dev); +err_pm_runtime_disable: pm_runtime_disable(&pdev->dev); return ret; }