summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-fsl-spi.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-08-30 13:35:51 +0300
committerMark Brown <broonie@kernel.org>2015-08-30 14:14:36 +0300
commit37c5db7938093cada165146ee99bd57c97baf6a3 (patch)
tree92b0a40a30d703c19acb26a10b5723124d9de8a8 /drivers/spi/spi-fsl-spi.c
parente9abb4db8d108624c293f06dce06b2978e626a13 (diff)
downloadlinux-37c5db7938093cada165146ee99bd57c97baf6a3.tar.xz
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>
Diffstat (limited to 'drivers/spi/spi-fsl-spi.c')
-rw-r--r--drivers/spi/spi-fsl-spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 17a9a879dcce..8b290d9d7935 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -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;
}