]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: fsl-mc: dprc: fix ordering problem freeing resources in remove of dprc
authorStuart Yoder <stuart.yoder@nxp.com>
Wed, 22 Jun 2016 21:40:50 +0000 (16:40 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jun 2016 00:14:03 +0000 (17:14 -0700)
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: Stuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fsl-mc/bus/dprc-driver.c

index 96ee1b7ce3609418bc1a21944c2c6c30c43c080a..d2a71f14bf72036a5e3d2d55518091b3b66420ee 100644 (file)
@@ -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;