Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a137fc80 authored by Stuart Yoder's avatar Stuart Yoder Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc: dprc: fix ordering problem freeing resources in remove of dprc 



When unbinding a dprc from the dprc driver the cleanup of
the resource pools must happen after irq pool cleanup
is done.

Signed-off-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae34934f

drivers/staging/fsl-mc/bus/dprc-driver.c

+6 −4
Original line number Diff line number Diff line
@@ -796,16 +796,18 @@ static int dprc_remove(struct fsl_mc_device *mc_dev) 
		dprc_teardown_irq(mc_dev);



	device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);

	dprc_cleanup_all_resource_pools(mc_dev);

	error = dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle);

	if (error < 0)

		dev_err(&mc_dev->dev, "dprc_close() failed: %d\n", error);



	if (dev_get_msi_domain(&mc_dev->dev)) {

		fsl_mc_cleanup_irq_pool(mc_bus);

		dev_set_msi_domain(&mc_dev->dev, NULL);

	}



	dprc_cleanup_all_resource_pools(mc_dev);



	error = dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle);

	if (error < 0)

		dev_err(&mc_dev->dev, "dprc_close() failed: %d\n", error);



	if (!fsl_mc_is_root_dprc(&mc_dev->dev)) {

		fsl_destroy_mc_io(mc_dev->mc_io);

		mc_dev->mc_io = NULL;