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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF797C19F2A for ; Thu, 11 Aug 2022 16:21:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237890AbiHKQVx (ORCPT ); Thu, 11 Aug 2022 12:21:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237609AbiHKQUW (ORCPT ); Thu, 11 Aug 2022 12:20:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77B91AEDBC; Thu, 11 Aug 2022 09:02:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 02E846137C; Thu, 11 Aug 2022 16:02:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01C33C433D6; Thu, 11 Aug 2022 16:02:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660233741; bh=BV8jj4uDtRkShNpde69E+aTS/tFXYjqy6nYKYoj5vrs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B8GU+AZK72+70tPLCON3fNdIHBnIFzv7jfaQ1wDfwdBQtnMBAI34ljr14tlQGcJsj TuAr/rY/UjfMq/v4L0duEa+GFZlKS1iAVtOkaWXLneZHITlM2oMjM2S7xStw5tYwGd Zq3z8I3iAs6A0k0qps4Or+nuShJ1MuZEiN9l85ShIAoG7vlR1QZwhg2sgrh/JUQD3J +pgyxoyO2B16HixQbcTMXDaL+Ur50BUtV8YBNyI5syvjqB24x7vzbx+Xs6E7hsW5dY Ercx/sGTfdmwgxwHGGMjoFUmCbpR2eQt4Le9V+dA6X3y1a5Uwc9oiOTYy5SElRet0h GLFy+iTHk8Ylw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Laurent Pinchart , Dafna Hirschfeld , Paul Elder , Mauro Carvalho Chehab , Sasha Levin , heiko@sntech.de, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.15 53/69] media: rkisp1: Disable runtime PM in probe error path Date: Thu, 11 Aug 2022 11:56:02 -0400 Message-Id: <20220811155632.1536867-53-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811155632.1536867-1-sashal@kernel.org> References: <20220811155632.1536867-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Laurent Pinchart [ Upstream commit 13c9810281f8b24af9b7712cd84a1fce61843e93 ] 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 Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- 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 560f928c3752..79cfa99f2a64 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c @@ -514,7 +514,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) { @@ -534,6 +534,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; } -- 2.35.1