summaryrefslogtreecommitdiff
path: root/drivers/mmc/sdhci.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-01-13 14:17:21 (GMT)
committerTom Rini <trini@konsulko.com>2017-01-13 14:17:21 (GMT)
commit83c2f0b451f1656a25272357aa60f6887d5564df (patch)
treee15fe91cb4664dd1fb9b847e258cd477dd075e87 /drivers/mmc/sdhci.c
parent70c1e0474a9df2c4493b4e2330cc41d3132b4e90 (diff)
parent0ad178c18af3ed7f5752005a42283c4f95fcd4e3 (diff)
downloadu-boot-fsl-qoriq-83c2f0b451f1656a25272357aa60f6887d5564df.tar.xz
Merge branch 'master' of http://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/mmc/sdhci.c')
-rw-r--r--drivers/mmc/sdhci.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index 3a1f4f7..5b404ff 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -359,7 +359,7 @@ static int sdhci_set_clock(struct mmc *mmc, unsigned int clock)
div >>= 1;
}
- if (host->ops->set_clock)
+ if (host->ops && host->ops->set_clock)
host->ops->set_clock(host, div);
clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT;
@@ -427,7 +427,7 @@ static int sdhci_set_ios(struct mmc *mmc)
u32 ctrl;
struct sdhci_host *host = mmc->priv;
- if (host->ops->set_control_reg)
+ if (host->ops && host->ops->set_control_reg)
host->ops->set_control_reg(host);
if (mmc->clock != host->clock)
@@ -480,7 +480,7 @@ static int sdhci_init(struct mmc *mmc)
sdhci_set_power(host, fls(mmc->cfg->voltages) - 1);
- if (host->ops->get_cd)
+ if (host->ops && host->ops->get_cd)
host->ops->get_cd(host);
/* Enable only interrupts served by the SD controller */