diff --git a/[refs] b/[refs] index 37825bc12d2f..9e17f0cce561 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 090d25fe224c0933d2b261aad91532e725c1d889 +refs/heads/master: 53d8f97462b0bbb51150f4d6bc2fd45336a008b9 diff --git a/trunk/drivers/mmc/card/block.c b/trunk/drivers/mmc/card/block.c index 8e6050869382..1d341f3878ec 100644 --- a/trunk/drivers/mmc/card/block.c +++ b/trunk/drivers/mmc/card/block.c @@ -1519,6 +1519,8 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, md->disk->queue = md->queue.queue; md->disk->driverfs_dev = parent; set_disk_ro(md->disk, md->read_only || default_ro); + if (area_type & MMC_BLK_DATA_AREA_RPMB) + md->disk->flags |= GENHD_FL_NO_PART_SCAN; /* * As discussed on lkml, GENHD_FL_REMOVABLE should: