From nobody Mon Sep 29 22:46:25 2025 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 AAE47C00140 for ; Tue, 16 Aug 2022 00:18:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351251AbiHPASS (ORCPT ); Mon, 15 Aug 2022 20:18:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347107AbiHPAKR (ORCPT ); Mon, 15 Aug 2022 20:10:17 -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 11A42173A36; Mon, 15 Aug 2022 13:29:16 -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 34F2C61184; Mon, 15 Aug 2022 20:29:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B70FC433C1; Mon, 15 Aug 2022 20:29:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660595355; bh=7Lvbr3yWglt5qIfD10p3dizhg1TsWM9D8DoP5cAkLTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FHQCalVx0W+DeBhVMYo/wcHaOcqePCpXSPzVGHP/58XL/we0uYHb24XvYAfWQWCKH /zHQgpxAh2YCuOBstcVTfA0BBq0zKa1Uoa519m64RnQJ1tsWDw2VtCCyJddPpfxVCL V2gaXG6kncLMkleyuF2ryd6t1CISp+JDBcOAg+FE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Wolfram Sang , Lad Prabhakar , Sergey Shtylyov , Miquel Raynal , Sasha Levin Subject: [PATCH 5.19 0739/1157] mtd: hyperbus: rpc-if: Fix RPM imbalance in probe error path Date: Mon, 15 Aug 2022 20:01:35 +0200 Message-Id: <20220815180509.032707517@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Geert Uytterhoeven [ Upstream commit c223a38d62e57aa60a890ea7247e3c58a54478e6 ] If rpcif_hw_init() fails, Runtime PM is left enabled. Fixes: b04cc0d912eb80d3 ("memory: renesas-rpc-if: Add support for RZ/G2L") Signed-off-by: Geert Uytterhoeven Reviewed-by: Wolfram Sang Reviewed-by: Lad Prabhakar Reviewed-by: Sergey Shtylyov Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/f3070e1af480cb252ae183d479a593dbbf9= 47685.1655457790.git.geert+renesas@glider.be Signed-off-by: Sasha Levin --- drivers/mtd/hyperbus/rpc-if.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/hyperbus/rpc-if.c b/drivers/mtd/hyperbus/rpc-if.c index 6e08ec1d4f09..b70d259e48a7 100644 --- a/drivers/mtd/hyperbus/rpc-if.c +++ b/drivers/mtd/hyperbus/rpc-if.c @@ -134,7 +134,7 @@ static int rpcif_hb_probe(struct platform_device *pdev) =20 error =3D rpcif_hw_init(&hyperbus->rpc, true); if (error) - return error; + goto out_disable_rpm; =20 hyperbus->hbdev.map.size =3D hyperbus->rpc.size; hyperbus->hbdev.map.virt =3D hyperbus->rpc.dirmap; @@ -145,8 +145,12 @@ static int rpcif_hb_probe(struct platform_device *pdev) hyperbus->hbdev.np =3D of_get_next_child(pdev->dev.parent->of_node, NULL); error =3D hyperbus_register_device(&hyperbus->hbdev); if (error) - rpcif_disable_rpm(&hyperbus->rpc); + goto out_disable_rpm; + + return 0; =20 +out_disable_rpm: + rpcif_disable_rpm(&hyperbus->rpc); return error; } =20 --=20 2.35.1