diff options
| author | J. German Rivera <German.Rivera@freescale.com> | 2015-03-27 16:01:07 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-03 13:55:03 +0200 |
| commit | 2bdc55d94fef59296f9f1aeda2a503d4c64cad86 (patch) | |
| tree | d1aa153da79e6820cd90f4c50a7abc0a153d3895 /drivers/staging/fsl-mc | |
| parent | 1663e80982eef51892576cb2e3d4978af787ca4d (diff) | |
staging: fsl-mc: Fix crash in fsl_mc_device_remove()
Only call fsl_mc_io_destroy() if the DPRC being removed
actually had an mc_io object associated with. Child DPRCs
that have not been bound to the DPRC driver or the VFIO driver
will not have an mc_io associated with them.
Signed-off-by: J. German Rivera <German.Rivera@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/fsl-mc')
| -rw-r--r-- | drivers/staging/fsl-mc/bus/dprc-driver.c | 9 | ||||
| -rw-r--r-- | drivers/staging/fsl-mc/bus/mc-bus.c | 9 |
2 files changed, 7 insertions, 11 deletions
diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/staging/fsl-mc/bus/dprc-driver.c index 9568eeac75b0..35c06cff1a06 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/staging/fsl-mc/bus/dprc-driver.c @@ -167,7 +167,6 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, for (i = 0; i < num_child_objects_in_mc; i++) { struct fsl_mc_device *child_dev; - struct fsl_mc_io *mc_io = NULL; struct dprc_obj_desc *obj_desc = &obj_desc_array[i]; if (strlen(obj_desc->type) == 0) @@ -182,14 +181,10 @@ static void dprc_add_new_devices(struct fsl_mc_device *mc_bus_dev, continue; } - error = fsl_mc_device_add(obj_desc, mc_io, &mc_bus_dev->dev, + error = fsl_mc_device_add(obj_desc, NULL, &mc_bus_dev->dev, &child_dev); - if (error < 0) { - if (mc_io) - fsl_destroy_mc_io(mc_io); - + if (error < 0) continue; - } } } diff --git a/drivers/staging/fsl-mc/bus/mc-bus.c b/drivers/staging/fsl-mc/bus/mc-bus.c index de15fa9b4ba7..d943d99ba992 100644 --- a/drivers/staging/fsl-mc/bus/mc-bus.c +++ b/drivers/staging/fsl-mc/bus/mc-bus.c @@ -444,15 +444,16 @@ void fsl_mc_device_remove(struct fsl_mc_device *mc_dev) put_device(&mc_dev->dev); if (strcmp(mc_dev->obj_desc.type, "dprc") == 0) { - struct fsl_mc_io *mc_io = mc_dev->mc_io; - mc_bus = to_fsl_mc_bus(mc_dev); - fsl_destroy_mc_io(mc_io); + if (mc_dev->mc_io) { + fsl_destroy_mc_io(mc_dev->mc_io); + mc_dev->mc_io = NULL; + } + if (&mc_dev->dev == fsl_mc_bus_type.dev_root) fsl_mc_bus_type.dev_root = NULL; } - mc_dev->mc_io = NULL; if (mc_bus) devm_kfree(mc_dev->dev.parent, mc_bus); else |