hvc_xen: avoid uninitialized variable warning

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

diff --git a/drivers/spi/spi-fsl-cpm.c b/drivers/spi/spi-fsl-cpm.c
index 6f466ab1201a3fd365822bea57e97df50885336a..896add8cfd3b6c6bba311a335072e63a4060a3a4 100644 (file)
--- 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);