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

Commit d08e2f97 authored by Roy Pledge's avatar Roy Pledge Committed by Greg Kroah-Hartman
Browse files

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: default avatarRoy Pledge <roy.pledge@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 03fcedc2

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

+1 −5
Original line number Diff line number Diff line
@@ -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 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev) 
	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: