Commit 6a9fbb6e authored by Tobias Jakobi's avatar Tobias Jakobi Committed by Minkyu Kang

exynos: Fix passing of errors in exynos_mmc_init()

exynos_mmc_init() always returns zero, so for the caller
it looks like it never fails.

Correct this by returning the error code of process_nodes().
For process_nodes() do something similar and return early
when do_sdhci_init() fails.

v2: Only fail in process_nodes() if we fail on all
    available nodes.
Acked-by: default avatarPrzemyslaw Marczak <p.marczak@samsung.com>
Signed-off-by: default avatarTobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: default avatarMinkyu Kang <mk7.kang@samsung.com>
parent 1a9d1731
......@@ -171,6 +171,7 @@ static int process_nodes(const void *blob, int node_list[], int count)
{
struct sdhci_host *host;
int i, node;
int failed = 0;
debug("%s: count = %d\n", __func__, count);
......@@ -184,11 +185,18 @@ static int process_nodes(const void *blob, int node_list[], int count)
if (sdhci_get_config(blob, node, host)) {
printf("%s: failed to decode dev %d\n", __func__, i);
return -1;
failed++;
continue;
}
if (do_sdhci_init(host)) {
printf("%s: failed to initialize dev %d\n", __func__, i);
failed++;
}
do_sdhci_init(host);
}
return 0;
/* we only consider it an error when all nodes fail */
return (failed == count ? -1 : 0);
}
int exynos_mmc_init(const void *blob)
......@@ -200,8 +208,6 @@ int exynos_mmc_init(const void *blob)
COMPAT_SAMSUNG_EXYNOS_MMC, node_list,
SDHCI_MAX_HOSTS);
process_nodes(blob, node_list, count);
return 0;
return process_nodes(blob, node_list, count);
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment