diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-13 08:13:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-13 08:13:56 -0400 |
| commit | c69f6d04ec66433f2360490a5cd0263c83aab18f (patch) | |
| tree | ea11b307b58f5abd066d57db87cdde43daf73c80 /drivers/mmc/bcm2835_sdhci.c | |
| parent | 79493609c5300be6cc555ab8bd38971360b381f6 (diff) | |
| parent | 57718f017b10871cd9dc03dca56c3bd690fc2614 (diff) | |
| download | u-boot-imx-c69f6d04ec66433f2360490a5cd0263c83aab18f.zip u-boot-imx-c69f6d04ec66433f2360490a5cd0263c83aab18f.tar.gz u-boot-imx-c69f6d04ec66433f2360490a5cd0263c83aab18f.tar.bz2 | |
Merge branch 'master' of http://git.denx.de/u-boot-mmc
Diffstat (limited to 'drivers/mmc/bcm2835_sdhci.c')
| -rw-r--r-- | drivers/mmc/bcm2835_sdhci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 680b754..cb2bd40 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -157,7 +157,7 @@ int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq) bcm_host = calloc(1, sizeof(*bcm_host)); if (!bcm_host) { printf("sdhci_host calloc fail!\n"); - return 1; + return -ENOMEM; } /* @@ -184,7 +184,6 @@ int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq) host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; host->ops = &bcm2835_ops; - host->version = sdhci_readw(host, SDHCI_HOST_VERSION); add_sdhci(host, emmc_freq, MIN_FREQ); return 0; |