]> git.sur5r.net Git - u-boot/commitdiff
mx6boards: Fix error handling in board_mmc_init()
authorFabio Estevam <fabio.estevam@freescale.com>
Fri, 21 Nov 2014 18:42:58 +0000 (16:42 -0200)
committerStefano Babic <sbabic@denx.de>
Mon, 24 Nov 2014 11:10:18 +0000 (12:10 +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.

Cc: Eric Benard <eric@eukrea.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
board/embest/mx6boards/mx6boards.c

index 02fb3fa1a4111a511876af4f37af5b12501937fd..f8c746824a7625edb6a36fb5956815590cb9f01a 100644 (file)
@@ -216,7 +216,7 @@ int board_mmc_getcd(struct mmc *mmc)
 
 int board_mmc_init(bd_t *bis)
 {
-       s32 status = 0;
+       int ret;
        int i;
 
        /*
@@ -268,13 +268,15 @@ int board_mmc_init(bd_t *bis)
                        printf("Warning: you configured more USDHC controllers"
                               "(%d) then supported by the board (%d)\n",
                               i + 1, CONFIG_SYS_FSL_USDHC_NUM);
-                       return status;
+                       return -EINVAL;
                }
 
-               status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+               ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+               if (ret)
+                       return ret;
        }
 
-       return status;
+       return 0;
 }
 #endif