nitrogen6x: Fix error handling in board_mmc_init()

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 Nelson <eric.nelson@boundarydevices.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

nitrogen6x: Fix error handling in board_mmc_init()
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 Nelson <eric.nelson@boundarydevices.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Fabio Estevam · Stefano Babic
1 parent e37197acad
Showing 1 changed file with 6 additions and 4 deletions Side-by-side Diff
board/boundary/nitrogen6x/nitrogen6x.c
@@ -302,7 +302,7 @@
  
 int board_mmc_init(bd_t *bis)
 {
-	s32 status = 0;
+	int ret;
 	u32 index = 0;
  
 	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
  
  
@@ -325,13 +325,15 @@
 		       printf("Warning: you configured more USDHC controllers"
 			       "(%d) then supported by the board (%d)\n",
 			       index + 1, CONFIG_SYS_FSL_USDHC_NUM);
-		       return status;
+		       return -EINVAL;
 		}
  
-		status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		if (ret)
+			return ret;
 	}
  
-	return status;
+	return 0;
 }
 #endif
...	...	@@ -302,7 +302,7 @@
302	302
303	303	int board_mmc_init(bd_t *bis)
304	304	{
305		- s32 status = 0;
	305	+ int ret;
306	306	u32 index = 0;
307	307
308	308	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
309	309
310	310
...	...	@@ -325,13 +325,15 @@
325	325	printf("Warning: you configured more USDHC controllers"
326	326	"(%d) then supported by the board (%d)\n",
327	327	index + 1, CONFIG_SYS_FSL_USDHC_NUM);
328		- return status;
	328	+ return -EINVAL;
329	329	}
330	330
331		- status \|= fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
	331	+ ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
	332	+ if (ret)
	333	+ return ret;
332	334	}
333	335
334		- return status;
	336	+ return 0;
335	337	}
336	338	#endif
337	339