diff options
| author | Jaehoon Chung <jh80.chung@samsung.com> | 2016-08-12 11:39:05 +0900 |
|---|---|---|
| committer | Jaehoon Chung <jh80.chung@samsung.com> | 2016-08-16 10:27:24 +0900 |
| commit | 177381a9f9e956353deaa56d86bec47e02995ff3 (patch) | |
| tree | 08e8741c9f71591a9c1836ebb4c43fc6fb9df574 /drivers/mmc | |
| parent | d188b1130226d304fb3cd2c901b968eca927f39f (diff) | |
mmc: mmc_legacy: fix the compiler error with disabled CONFIG_DM_MMC_OPS
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/mmc_legacy.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mmc/mmc_legacy.c b/drivers/mmc/mmc_legacy.c index 040728b45d..25361d10f6 100644 --- a/drivers/mmc/mmc_legacy.c +++ b/drivers/mmc/mmc_legacy.c @@ -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; |