diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2022-03-29 17:00:39 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-04 10:38:59 +0300 |
| commit | 2f8cf5f642e80f8b6b0e660a9c86924a1f41cd80 (patch) | |
| tree | bbd2981c260eb0bcfcfa8b8ce6b1fb7d99d5608d | |
| parent | 3123109284176b1532874591f7c81f3837bbdc17 (diff) | |
| download | linux-2f8cf5f642e80f8b6b0e660a9c86924a1f41cd80.tar.xz | |
spi: rpc-if: Fix RPM imbalance in probe error path
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>
| -rw-r--r-- | drivers/spi/spi-rpc-if.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/spi/spi-rpc-if.c b/drivers/spi/spi-rpc-if.c index fe82f3575df4..24ec1c83f379 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; } |