mmc: Merge branch fixes into next

[linux-2.6-microblaze.git] / drivers / mmc / core / block.c

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index bd165ce..64a3492 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -874,10 +874,11 @@ static const struct block_device_operations mmc_bdops = {
 static int mmc_blk_part_switch_pre(struct mmc_card *card,
                                   unsigned int part_type)
 {
-       const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_RPMB;
+       const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_MASK;
+       const unsigned int rpmb = EXT_CSD_PART_CONFIG_ACC_RPMB;
        int ret = 0;
 
-       if ((part_type & mask) == mask) {
+       if ((part_type & mask) == rpmb) {
                if (card->ext_csd.cmdq_en) {
                        ret = mmc_cmdq_disable(card);
                        if (ret)
@@ -892,10 +893,11 @@ static int mmc_blk_part_switch_pre(struct mmc_card *card,
 static int mmc_blk_part_switch_post(struct mmc_card *card,
                                    unsigned int part_type)
 {
-       const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_RPMB;
+       const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_MASK;
+       const unsigned int rpmb = EXT_CSD_PART_CONFIG_ACC_RPMB;
        int ret = 0;
 
-       if ((part_type & mask) == mask) {
+       if ((part_type & mask) == rpmb) {
                mmc_retune_unpause(card->host);
                if (card->reenable_cmdq && !card->ext_csd.cmdq_en)
                        ret = mmc_cmdq_enable(card);