mx53loco: Fix error handling in board_mmc_init()
authorFabio Estevam <fabio.estevam@freescale.com>
Sat, 15 Nov 2014 16:50:27 +0000 (14:50 -0200)
committerStefano Babic <sbabic@denx.de>
Thu, 20 Nov 2014 09:30:20 +0000 (10:30 +0100)
When an invalid USDHC port is passed we should return -EINVAL instead of 0.

Also, return the error immediately on fsl_esdhc_initialize() failure.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
board/freescale/mx53loco/mx53loco.c

index 7569ded8d8215b3ef60dd2e97fe8dd0f4e342edb..efcf4b390d35f97353f76daa579888cab5adaa4c 100644 (file)
@@ -186,7 +186,7 @@ int board_mmc_init(bd_t *bis)
        };
 
        u32 index;
-       s32 status = 0;
+       int ret;
 
        esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK);
        esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
@@ -205,12 +205,14 @@ int board_mmc_init(bd_t *bis)
                        printf("Warning: you configured more ESDHC controller"
                                "(%d) as supported by the board(2)\n",
                                CONFIG_SYS_FSL_ESDHC_NUM);
-                       return status;
+                       return -EINVAL;
                }
-               status |= fsl_esdhc_initialize(bis, &esdhc_cfg[index]);
+               ret = fsl_esdhc_initialize(bis, &esdhc_cfg[index]);
+               if (ret)
+                       return ret;
        }
 
-       return status;
+       return 0;
 }
 #endif