1 From b104ed7497745e2e6da214b37ef22edaf38098c7 Mon Sep 17 00:00:00 2001
2 From: Stuart Yoder <stuart.yoder@nxp.com>
3 Date: Wed, 22 Jun 2016 16:40:50 -0500
4 Subject: [PATCH 187/226] staging: fsl-mc: dprc: fix ordering problem freeing
5 resources in remove of dprc
7 When unbinding a dprc from the dprc driver the cleanup of
8 the resource pools must happen after irq pool cleanup
11 Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
12 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
14 drivers/staging/fsl-mc/bus/dprc-driver.c | 10 ++++++----
15 1 file changed, 6 insertions(+), 4 deletions(-)
17 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c
18 +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c
19 @@ -796,16 +796,18 @@ static int dprc_remove(struct fsl_mc_dev
20 dprc_teardown_irq(mc_dev);
22 device_for_each_child(&mc_dev->dev, NULL, __fsl_mc_device_remove);
23 - dprc_cleanup_all_resource_pools(mc_dev);
24 - error = dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle);
26 - dev_err(&mc_dev->dev, "dprc_close() failed: %d\n", error);
28 if (dev_get_msi_domain(&mc_dev->dev)) {
29 fsl_mc_cleanup_irq_pool(mc_bus);
30 dev_set_msi_domain(&mc_dev->dev, NULL);
33 + dprc_cleanup_all_resource_pools(mc_dev);
35 + error = dprc_close(mc_dev->mc_io, 0, mc_dev->mc_handle);
37 + dev_err(&mc_dev->dev, "dprc_close() failed: %d\n", error);
39 if (!fsl_mc_is_root_dprc(&mc_dev->dev)) {
40 fsl_destroy_mc_io(mc_dev->mc_io);