Unverified Commit 0deb0039 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

ASoC: amd: acp: Fix error handling in .remove() 



Even in the presence of problems (here: rn_acp_deinit() might fail), it's
important to unregister all resources acquired during .probe() because
even if .remove() returns an error code, the device is removed.

As .remove() is only called after .probe() returned success, platdata
must be valid, so the first check in .remove() can just be dropped.

This is a preparation for making platform remove callbacks return void.

Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20220622061739.225966-1-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1892a991

sound/soc/amd/acp/acp-renoir.c

+2 −8
Original line number Diff line number Diff line
@@ -307,16 +307,10 @@ static int renoir_audio_remove(struct platform_device *pdev) 
	int ret;



	chip = dev_get_platdata(&pdev->dev);

	if (!chip || !chip->base) {

		dev_err(&pdev->dev, "ACP chip data is NULL\n");

		return -ENODEV;

	}



	ret = rn_acp_deinit(chip->base);

	if (ret) {

		dev_err(&pdev->dev, "ACP de-init Failed\n");

		return -EINVAL;

	}

	if (ret)

		dev_err(&pdev->dev, "ACP de-init Failed (%pe)\n", ERR_PTR(ret));



	acp_platform_unregister(dev);

	return 0;