[U-Boot] [PATCH V2] cmd_mmc.c: check mmc_init() during mmc dev

* [U-Boot] [PATCH V2] cmd_mmc.c: check mmc_init() during mmc dev
@ 2014-05-20 16:57 Stephen Warren
  2014-05-21  5:40 ` Jaehoon Chung
  2014-05-23 18:59 ` Stephen Warren
  0 siblings, 2 replies; 7+ messages in thread
From: Stephen Warren @ 2014-05-20 16:57 UTC (permalink / raw)
  To: u-boot

From: Bryan Wu <cooloney@gmail.com>

mmc dev ${devnum} will return 0 as success even if there is no card
inserted. Booting script like tegra-common-post.h will call mmc dev
${devnum} to check the mmc device status, it always return 0 even if
mmc_init() fails.

Check mmc_init() return value let mmc dev command return failure
when mmc_init() fails.

Signed-off-by: Bryan Wu <pengw@nvidia.com>
[swarren: Always return 1 on error; hush doesn't appear to support
arbitrary return values. Fixed compilation error due to multiple
declaration of ret variable.]
Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
v2:
* Always return 1 on error; hush doesn't appear to support
  arbitrary return values.
* Fixed compilation error due to multiple declaration of ret variable.
---
 common/cmd_mmc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index 572aa895fa1c..2e564572f74d 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -217,7 +217,10 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 			return 1;
 		}
 
-		mmc_init(mmc);
+		ret = mmc_init(mmc);
+		if (ret)
+			return 1;
+
 		if (part != -1) {
 			ret = mmc_select_hwpart(dev, part);
 			printf("switch to partitions #%d, %s\n",
-- 
1.8.1.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread