aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/fsl-mc
diff options
context:
space:
mode:
authorRoy Pledge <roy.pledge@nxp.com>2018-03-27 14:13:32 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-23 15:51:34 +0200
commitd08e2f9728ca5ceeb1ba026a2a1c741d7833d756 (patch)
treeb606514f2ff6c7355e289231515f8ce47ea002da /drivers/staging/fsl-mc
parentdrivers/staging/fsl-mc: Use devm_memremap/devm_ioremap for DPIO (diff)
downloadlinux-dev-d08e2f9728ca5ceeb1ba026a2a1c741d7833d756.tar.xz
linux-dev-d08e2f9728ca5ceeb1ba026a2a1c741d7833d756.zip
drivers/staging/fsl-mc: Fix DPIO error path issue
Remove unneeded call to dev_set_drvdata(dev, NULL) since the device will be deallocated in any case. Signed-off-by: Roy Pledge <roy.pledge@nxp.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/dpio/dpio-driver.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c b/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
index ffcbd5af9050..9e125769a4e7 100644
--- a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
+++ b/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
@@ -101,7 +101,7 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev)
if (err) {
dev_dbg(dev, "MC portal allocation failed\n");
err = -EPROBE_DEFER;
- goto err_mcportal;
+ goto err_priv_alloc;
}
err = dpio_open(dpio_dev->mc_io, 0, dpio_dev->obj_desc.id,
@@ -196,8 +196,6 @@ err_get_attr:
dpio_close(dpio_dev->mc_io, 0, dpio_dev->mc_handle);
err_open:
fsl_mc_portal_free(dpio_dev->mc_io);
-err_mcportal:
- dev_set_drvdata(dev, NULL);
err_priv_alloc:
return err;
}
@@ -241,8 +239,6 @@ static int dpaa2_dpio_remove(struct fsl_mc_device *dpio_dev)
fsl_mc_portal_free(dpio_dev->mc_io);
- dev_set_drvdata(dev, NULL);
-
return 0;
err_open: