Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / drivers / spi / spi-fsl-espi.c

diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index db82c872c0f9b9ff6f952b5c6e54919f5697ef35..c27124a5ec8ee02264df2feaf283fdbb92991cf3 100644 (file)
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -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;
        }