1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 4409d79ed650..c69afb5e264e 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -2147,7 +2147,7 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
          */
 
         snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),
-                 "mmcblk%d%s", md->name_idx, subname ? subname : "");
+                 "mmcblk%u%s", md->name_idx, subname ? subname : "");
 
         if (mmc_card_mmc(card))
                 blk_queue_logical_block_size(md->queue.queue,
@@ -2193,7 +2193,6 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card,
 static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
 {
         sector_t size;
-        struct mmc_blk_data *md;
 
         if (!mmc_card_sd(card) && mmc_card_blockaddr(card)) {
                 /*
@@ -2209,9 +2208,8 @@ static struct mmc_blk_data *mmc_blk_alloc(struct mmc_card *card)
                 size = card->csd.capacity << (card->csd.read_blkbits - 9);
         }
 
-        md = mmc_blk_alloc_req(card, &card->dev, size, false, NULL,
+        return mmc_blk_alloc_req(card, &card->dev, size, false, NULL,
                                         MMC_BLK_DATA_AREA_MAIN);
-        return md;
 }
 
 static int mmc_blk_alloc_part(struct mmc_card *card,