diff options
author | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2016-05-24 14:55:06 +0200 |
commit | 08ca213acadef61748dc62d48b0f5c4bed8b8c2d (patch) | |
tree | 36cf415b78775ee63acdfc34d636d2b7d7936a78 /drivers/dfu/dfu_mmc.c | |
parent | d15a244b059e361475302bccd471e65a48ee2b1f (diff) | |
parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
download | blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.tar.gz blackbird-obmc-uboot-08ca213acadef61748dc62d48b0f5c4bed8b8c2d.zip |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'drivers/dfu/dfu_mmc.c')
-rw-r--r-- | drivers/dfu/dfu_mmc.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c index faece8883a..78724e467b 100644 --- a/drivers/dfu/dfu_mmc.c +++ b/drivers/dfu/dfu_mmc.c @@ -50,8 +50,9 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, if (dfu->data.mmc.hw_partition >= 0) { part_num_bkp = mmc->block_dev.hwpart; - ret = mmc_select_hwpart(dfu->data.mmc.dev_num, - dfu->data.mmc.hw_partition); + ret = blk_select_hwpart_devnum(IF_TYPE_MMC, + dfu->data.mmc.dev_num, + dfu->data.mmc.hw_partition); if (ret) return ret; } @@ -75,12 +76,16 @@ static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, if (n != blk_count) { error("MMC operation failed"); if (dfu->data.mmc.hw_partition >= 0) - mmc_select_hwpart(dfu->data.mmc.dev_num, part_num_bkp); + blk_select_hwpart_devnum(IF_TYPE_MMC, + dfu->data.mmc.dev_num, + part_num_bkp); return -EIO; } if (dfu->data.mmc.hw_partition >= 0) { - ret = mmc_select_hwpart(dfu->data.mmc.dev_num, part_num_bkp); + ret = blk_select_hwpart_devnum(IF_TYPE_MMC, + dfu->data.mmc.dev_num, + part_num_bkp); if (ret) return ret; } |