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

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
...@@ -150,14 +150,16 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev) ...@@ -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, desc.regs_cena = devm_memremap(dev, dpio_dev->regions[1].start,
resource_size(&dpio_dev->regions[1]), resource_size(&dpio_dev->regions[1]),
MEMREMAP_WC); MEMREMAP_WC);
if (!desc.regs_cena) { if (IS_ERR(desc.regs_cena)) {
dev_err(dev, "devm_memremap failed\n"); dev_err(dev, "devm_memremap failed\n");
err = PTR_ERR(desc.regs_cena);
goto err_allocate_irqs; goto err_allocate_irqs;
} }
desc.regs_cinh = devm_ioremap(dev, dpio_dev->regions[1].start, desc.regs_cinh = devm_ioremap(dev, dpio_dev->regions[1].start,
resource_size(&dpio_dev->regions[1])); resource_size(&dpio_dev->regions[1]));
if (!desc.regs_cinh) { if (!desc.regs_cinh) {
err = -ENOMEM;
dev_err(dev, "devm_ioremap failed\n"); dev_err(dev, "devm_ioremap failed\n");
goto err_allocate_irqs; goto err_allocate_irqs;
} }
...@@ -175,6 +177,7 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev) ...@@ -175,6 +177,7 @@ static int dpaa2_dpio_probe(struct fsl_mc_device *dpio_dev)
priv->io = dpaa2_io_create(&desc); priv->io = dpaa2_io_create(&desc);
if (!priv->io) { if (!priv->io) {
dev_err(dev, "dpaa2_io_create failed\n"); dev_err(dev, "dpaa2_io_create failed\n");
err = -ENOMEM;
goto err_dpaa2_io_create; goto err_dpaa2_io_create;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment