leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: mmc_legacy: fix the compiler error with disabled CONFIG_DM_MMC_OPS

Browse Source 
To prevent the compiler error, split the checking condition whether
cfg->ops is NULL or not.
It's more clearly, because it's not included in mmc_config structure
when CONFIG_DM_MMC_OPS is disabled.

drivers/mmc/mmc_legacy.c: In function ‘mmc_create’:
drivers/mmc/mmc_legacy.c:118:31: error: ‘const struct mmc_config’ has no member named ‘ops’
drivers/mmc/mmc_legacy.c:118:58: error: ‘const struct mmc_config’ has no member named ‘ops’
make[1]: *** [drivers/mmc/mmc_legacy.o] Error 1

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Jaehoon Chung 2016-08-12 11:39:05 +09:00
parent d188b11302
commit 177381a9f9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mmc/mmc_legacy.c
View File

@ -115,10 +115,15 @@ struct mmc *mmc_create(const struct mmc_config *cfg, void *priv)
struct mmc *mmc;
/* quick validation */
if (cfg == NULL || cfg->ops == NULL || cfg->ops->send_cmd == NULL ||
cfg->f_min == 0 || cfg->f_max == 0 || cfg->b_max == 0)
if (cfg == NULL || cfg->f_min == 0 ||
cfg->f_max == 0 || cfg->b_max == 0)
return NULL;
#ifndef CONFIG_DM_MMC_OPS
if (cfg->ops == NULL || cfg->ops->send_cmd == NULL)
return NULL;
#endif
mmc = calloc(1, sizeof(*mmc));
if (mmc == NULL)
return NULL;