Commit c223a38d authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Miquel Raynal
Browse files

mtd: hyperbus: rpc-if: Fix RPM imbalance in probe error path 



If rpcif_hw_init() fails, Runtime PM is left enabled.

Fixes: b04cc0d9 ("memory: renesas-rpc-if: Add support for RZ/G2L")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/f3070e1af480cb252ae183d479a593dbbf947685.1655457790.git.geert+renesas@glider.be
parent 278811d5

drivers/mtd/hyperbus/rpc-if.c

+6 −2
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int rpcif_hb_probe(struct platform_device *pdev) 


	error = rpcif_hw_init(&hyperbus->rpc, true);

	if (error)

		return error;

		goto out_disable_rpm;



	hyperbus->hbdev.map.size = hyperbus->rpc.size;

	hyperbus->hbdev.map.virt = hyperbus->rpc.dirmap;
@@ -145,8 +145,12 @@ static int rpcif_hb_probe(struct platform_device *pdev) 
	hyperbus->hbdev.np = of_get_next_child(pdev->dev.parent->of_node, NULL);

	error = hyperbus_register_device(&hyperbus->hbdev);

	if (error)

		rpcif_disable_rpm(&hyperbus->rpc);

		goto out_disable_rpm;



	return 0;



out_disable_rpm:

	rpcif_disable_rpm(&hyperbus->rpc);

	return error;

}