sd, mmc, virtio_blk, string_helpers: fix block size units

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / card / block.c

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index c69afb5e264e53976a3bf85a1bbd31d127668381..2fc426926574ec0b092485313b852158272d96ae 100644 (file)
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2230,7 +2230,7 @@ static int mmc_blk_alloc_part(struct mmc_card *card,
        part_md->part_type = part_type;
        list_add(&part_md->part, &md->part);
 
-       string_get_size((u64)get_capacity(part_md->disk) << 9, STRING_UNITS_2,
+       string_get_size((u64)get_capacity(part_md->disk), 512, STRING_UNITS_2,
                        cap_str, sizeof(cap_str));
        pr_info("%s: %s %s partition %u %s\n",
               part_md->disk->disk_name, mmc_card_id(card),
@@ -2436,7 +2436,7 @@ static int mmc_blk_probe(struct device *dev)
        if (IS_ERR(md))
                return PTR_ERR(md);
 
-       string_get_size((u64)get_capacity(md->disk) << 9, STRING_UNITS_2,
+       string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2,
                        cap_str, sizeof(cap_str));
        pr_info("%s: %s %s %s %s\n",
                md->disk->disk_name, mmc_card_id(card), mmc_card_name(card),