From: Al Cooper <acooper@xxxxxxxxxxxx> Change the MMC block layer to avoid reading the partition table when the card is locked because read commands will fail. refs #SWLINUX-2545 Signed-off-by: Al Cooper <acooper@xxxxxxxxxxxx> --- drivers/mmc/card/block.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index cd0b7f4..8eb254f 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -2047,6 +2047,13 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, md->disk->flags |= GENHD_FL_NO_PART_SCAN; /* + * If the card is locked, reads will fail so prevent partition + * table scan + */ + if (mmc_card_locked(card)) + md->disk->flags |= GENHD_FL_NO_PART_SCAN; + + /* * As discussed on lkml, GENHD_FL_REMOVABLE should: * * - be set for removable media with permanent block devices -- 1.8.1.3 -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html