From: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
To: cip-dev@lists.cip-project.org,
Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>,
Pavel Machek <pavel@denx.de>
Cc: Biju Das <biju.das.jz@bp.renesas.com>
Subject: [PATCH 5.10.y-cip 07/11] spi: rpc-if: Fix RPM imbalance in probe error path
Date: Fri, 12 Aug 2022 11:13:13 +0100 [thread overview]
Message-ID: <20220812101317.12380-8-prabhakar.mahadev-lad.rj@bp.renesas.com> (raw)
In-Reply-To: <20220812101317.12380-1-prabhakar.mahadev-lad.rj@bp.renesas.com>
From: Geert Uytterhoeven <geert+renesas@glider.be>
commit 2f8cf5f642e80f8b6b0e660a9c86924a1f41cd80 upstream.
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 <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/1c78a1f447d019bb66b6e7787f520ae78821e2ae.1648562287.git.geert+renesas@glider.be
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
drivers/spi/spi-rpc-if.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi-rpc-if.c b/drivers/spi/spi-rpc-if.c
index 651d92028306..0f8096d7d7b0 100644
--- a/drivers/spi/spi-rpc-if.c
+++ b/drivers/spi/spi-rpc-if.c
@@ -158,14 +158,18 @@ static int rpcif_spi_probe(struct platform_device *pdev)
error = rpcif_hw_init(rpc, false);
if (error)
- return error;
+ goto out_disable_rpm;
error = spi_register_controller(ctlr);
if (error) {
dev_err(&pdev->dev, "spi_register_controller failed\n");
- rpcif_disable_rpm(rpc);
+ goto out_disable_rpm;
}
+ return 0;
+
+out_disable_rpm:
+ rpcif_disable_rpm(rpc);
return error;
}
--
2.17.1
next prev parent reply other threads:[~2022-08-12 10:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 10:13 [PATCH 5.10.y-cip 00/11] Renesas RPCI-IF and RSPI driver fixes and improvements Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 01/11] memory: renesas-rpc-if: Silence clang warning Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 02/11] memory: renesas-rpc-if: simplify register update Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 03/11] memory: renesas-rpc-if: avoid use of undocumented bits Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 04/11] memory: renesas-rpc-if: refactor MOIIO and IOFV macros Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 05/11] memory: renesas-rpc-if: Simplify single/double data register access Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 06/11] memory: renesas-rpc-if: simplify platform_get_resource_byname() Lad Prabhakar
2022-08-12 10:13 ` Lad Prabhakar [this message]
2022-08-12 10:13 ` [PATCH 5.10.y-cip 08/11] spi: spi-rspi: : use proper DMAENGINE API for termination Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 09/11] spi: rspi: drop unneeded MODULE_ALIAS Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 10/11] spi: spi-rspi: Drop redeclaring ret variable in qspi_transfer_in() Lad Prabhakar
2022-08-12 10:13 ` [PATCH 5.10.y-cip 11/11] spi: spi-rspi: Fix PIO fallback on RZ platforms Lad Prabhakar
2022-08-13 14:17 ` [PATCH 5.10.y-cip 00/11] Renesas RPCI-IF and RSPI driver fixes and improvements Pavel Machek
2022-08-16 21:48 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220812101317.12380-8-prabhakar.mahadev-lad.rj@bp.renesas.com \
--to=prabhakar.mahadev-lad.rj@bp.renesas.com \
--cc=biju.das.jz@bp.renesas.com \
--cc=cip-dev@lists.cip-project.org \
--cc=nobuhiro1.iwamatsu@toshiba.co.jp \
--cc=pavel@denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.