mx53smd: Fix error handling in board_mmc_init()
authorFabio Estevam <fabio.estevam@freescale.com>
Thu, 20 Nov 2014 18:35:18 +0000 (16:35 -0200)
committerStefano Babic <sbabic@denx.de>
Fri, 21 Nov 2014 15:47:55 +0000 (16:47 +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/mx53smd/mx53smd.c

index d64c674e915567ed04206452fb0d8ba7e5952674..0963fd7b43a75245f444b26765a59f716e64280d 100644 (file)
@@ -106,7 +106,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);
 
@@ -121,12 +121,14 @@ int board_mmc_init(bd_t *bis)
                        printf("Warning: you configured more ESDHC controller"
                                "(%d) as supported by the board(1)\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