Merge tag 'for-linus-20151006' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / drivers / spi / spi-mpc512x-psc.c

diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 280794dd248ae1a91b0504f4d39ea0e28d38f934..1e75341689a622916bad62e4429d4ed4c5315fc2 100644 (file)
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -40,8 +40,8 @@ enum {
  * MPC5121 (which uses a struct mpc52xx_psc) and MPC5125 (using mpc5125_psc).
  */
 #define psc_addr(mps, regname) ({                                      \
-       void *__ret;                                                    \
-       switch(mps->type) {                                             \
+       void *__ret = NULL;                                             \
+       switch (mps->type) {                                            \
        case TYPE_MPC5121: {                                            \
                        struct mpc52xx_psc __iomem *psc = mps->psc;     \
                        __ret = &psc->regname;                          \