Commit 2dc6de1c authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'cfi/for-5.17' into mtd/next 



Hyperbus changes for v5.17-rc1

Hyperbus changes:

Couple of fixes in Renesas hyperbus rpc-if driver to avoid crash on
module remove and for missing check for error value in probe.

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parents 6420ac0a baaf965f

drivers/mtd/hyperbus/rpc-if.c

+5 −3
Original line number Diff line number Diff line
@@ -124,7 +124,9 @@ static int rpcif_hb_probe(struct platform_device *pdev) 
	if (!hyperbus)

		return -ENOMEM;



	rpcif_sw_init(&hyperbus->rpc, pdev->dev.parent);

	error = rpcif_sw_init(&hyperbus->rpc, pdev->dev.parent);

	if (error)

		return error;



	platform_set_drvdata(pdev, hyperbus);
@@ -150,9 +152,9 @@ static int rpcif_hb_remove(struct platform_device *pdev) 
{

	struct rpcif_hyperbus *hyperbus = platform_get_drvdata(pdev);

	int error = hyperbus_unregister_device(&hyperbus->hbdev);

	struct rpcif *rpc = dev_get_drvdata(pdev->dev.parent);



	rpcif_disable_rpm(rpc);

	rpcif_disable_rpm(&hyperbus->rpc);



	return error;

}