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

Commit 37c5db79 authored Aug 30, 2015 by Axel Lin Committed by Mark Brown Aug 30, 2015

spi: fsl-(e)spi: Fix checking return value of devm_ioremap_resource



devm_ioremap_resource() returns ERR_PTR on error.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent e9abb4db

drivers/spi/spi-fsl-espi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -674,8 +674,8 @@ static struct spi_master * fsl_espi_probe(struct device *dev,
		mpc8xxx_spi = spi_master_get_devdata(master);

		mpc8xxx_spi->reg_base = devm_ioremap_resource(dev, mem);
		if (!mpc8xxx_spi->reg_base) {
		ret = -ENOMEM;
		if (IS_ERR(mpc8xxx_spi->reg_base)) {
		ret = PTR_ERR(mpc8xxx_spi->reg_base);
		goto err_probe;
		}

drivers/spi/spi-fsl-spi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -633,8 +633,8 @@ static struct spi_master * fsl_spi_probe(struct device *dev,
		goto err_cpm_init;

		mpc8xxx_spi->reg_base = devm_ioremap_resource(dev, mem);
		if (mpc8xxx_spi->reg_base == NULL) {
		ret = -ENOMEM;
		if (IS_ERR(mpc8xxx_spi->reg_base)) {
		ret = PTR_ERR(mpc8xxx_spi->reg_base);
		goto err_probe;
		}