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

Commit 50307552 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

staging: fsl-mc/dpio: Fix the error handling in probe() 



First of all devm_memremap() function returns an error pointer, it
doesn't return NULL.  And second we need to set the error code on these
paths.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3c2b8df0

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

+4 −1
Original line number Diff line number Diff line
@@ -150,14 +150,16 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev) 
	desc.regs_cena = devm_memremap(dev, dpio_dev->regions[1].start,

				       resource_size(&dpio_dev->regions[1]),

				       MEMREMAP_WC);

	if (!desc.regs_cena) {

	if (IS_ERR(desc.regs_cena)) {

		dev_err(dev, "devm_memremap failed\n");

		err = PTR_ERR(desc.regs_cena);

		goto err_allocate_irqs;

	}



	desc.regs_cinh = devm_ioremap(dev, dpio_dev->regions[1].start,

				      resource_size(&dpio_dev->regions[1]));

	if (!desc.regs_cinh) {

		err = -ENOMEM;

		dev_err(dev, "devm_ioremap failed\n");

		goto err_allocate_irqs;

	}
@@ -175,6 +177,7 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev) 
	priv->io = dpaa2_io_create(&desc);

	if (!priv->io) {

		dev_err(dev, "dpaa2_io_create failed\n");

		err = -ENOMEM;

		goto err_dpaa2_io_create;

	}