diff options
| author |   Christophe Leroy <christophe.leroy@c-s.fr> | 2015-04-23 14:11:47 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2015-04-24 13:27:53 +0100 |
| commit | 73ee39a4c944a11cfd6d43ba1f634da340bf5537 (patch) | |
| tree | a3e0901686cbc8f4a8e326b81c3230b2f6e3747b | |
| parent | spi: fsl-spi: use devm_ioremap_resource() to map parameter ram on CPM1 (diff) | |
| download | linux-dev-73ee39a4c944a11cfd6d43ba1f634da340bf5537.tar.xz linux-dev-73ee39a4c944a11cfd6d43ba1f634da340bf5537.zip | |
spi: fsl-spi: fix devm_ioremap_resource() error case
devm_ioremap_resource() doesn't return NULL but an ERR_PTR on error.
Reported-by: Jonas Gorsky <jogo@openwrt.org>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/spi/spi-fsl-cpm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c index 6f466ab1201a..896add8cfd3b 100644 --- a/drivers/spi/spi-fsl-cpm.c +++ b/drivers/spi/spi-fsl-cpm.c @@ -310,10 +310,15 @@ int fsl_spi_cpm_init(struct mpc8xxx_spi *mspi) if (mspi->flags & SPI_CPM1) { struct resource *res; + void *pram; res = platform_get_resource(to_platform_device(dev), IORESOURCE_MEM, 1); - mspi->pram = devm_ioremap_resource(dev, res); + pram = devm_ioremap_resource(dev, res); + if (IS_ERR(pram)) + mspi->pram = NULL; + else + mspi->pram = pram; } else { unsigned long pram_ofs = fsl_spi_cpm_get_pram(mspi); |