Skip to content

Commit 2f8cf5f

Browse files
geertubroonie
authored andcommitted
spi: rpc-if: Fix RPM imbalance in probe error path
If rpcif_hw_init() fails, Runtime PM is left enabled. Fixes: b04cc0d ("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>
1 parent 3123109 commit 2f8cf5f

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/spi/spi-rpc-if.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,18 @@ static int rpcif_spi_probe(struct platform_device *pdev)
158158

159159
error = rpcif_hw_init(rpc, false);
160160
if (error)
161-
return error;
161+
goto out_disable_rpm;
162162

163163
error = spi_register_controller(ctlr);
164164
if (error) {
165165
dev_err(&pdev->dev, "spi_register_controller failed\n");
166-
rpcif_disable_rpm(rpc);
166+
goto out_disable_rpm;
167167
}
168168

169+
return 0;
170+
171+
out_disable_rpm:
172+
rpcif_disable_rpm(rpc);
169173
return error;
170174
}
171175

0 commit comments

Comments
 (0)