Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Geert Uytterhoeven and committed by
Mark Brown
2f8cf5f6 31231092

+6 -2
+6 -2
drivers/spi/spi-rpc-if.c
··· 158 158 159 159 error = rpcif_hw_init(rpc, false); 160 160 if (error) 161 - return error; 161 + goto out_disable_rpm; 162 162 163 163 error = spi_register_controller(ctlr); 164 164 if (error) { 165 165 dev_err(&pdev->dev, "spi_register_controller failed\n"); 166 - rpcif_disable_rpm(rpc); 166 + goto out_disable_rpm; 167 167 } 168 168 169 + return 0; 170 + 171 + out_disable_rpm: 172 + rpcif_disable_rpm(rpc); 169 173 return error; 170 174 } 171 175