diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-08 09:25:08 +0200 |
| commit | 519fdde9e6a6ebce7dc743b4f5621503d25b7a45 (patch) | |
| tree | 29649f48b92b92342183f71565c34afeca0b1735 /drivers/mmc/mmc_write.c | |
| parent | c71645ad2bd5179ad21e2501c26f574e9688f02a (diff) | |
| parent | 04d2f0a9f33112bd70ce4d9c451fdca1682e3a59 (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
arch/arm/cpu/arm926ejs/mxs/Makefile
include/configs/trats.h
include/configs/trats2.h
include/mmc.h
Diffstat (limited to 'drivers/mmc/mmc_write.c')
| -rw-r--r-- | drivers/mmc/mmc_write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c index aa2fdefa75e..3db9669c82e 100644 --- a/drivers/mmc/mmc_write.c +++ b/drivers/mmc/mmc_write.c @@ -167,7 +167,8 @@ ulong mmc_bwrite(int dev_num, lbaint_t start, lbaint_t blkcnt, const void *src) return 0; do { - cur = (blocks_todo > mmc->b_max) ? mmc->b_max : blocks_todo; + cur = (blocks_todo > mmc->cfg->b_max) ? + mmc->cfg->b_max : blocks_todo; if (mmc_write_blocks(mmc, start, cur, src) != cur) return 0; blocks_todo -= cur; |