diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-12-07 14:59:57 +0100 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-12-07 14:59:57 +0100 |
| commit | 6fc0ca179141ddb747338b38081b11e5db30966c (patch) | |
| tree | a96123293026d759ee2b037768fcf84fb4c7a069 /drivers/mmc/core | |
| parent | 9463571b29bf03a0dc1114f0cb17042b179066f9 (diff) | |
| parent | e7794c14fd73e5eb4a3e0ecaa5334d5a17377c50 (diff) | |
| download | linux-stable-6fc0ca179141ddb747338b38081b11e5db30966c.tar.gz linux-stable-6fc0ca179141ddb747338b38081b11e5db30966c.tar.bz2 linux-stable-6fc0ca179141ddb747338b38081b11e5db30966c.zip | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.7-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.8.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/block.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 892e74e611a0..32d49100dff5 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -874,9 +874,10 @@ 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; int ret = 0; - if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) { + if ((part_type & mask) == mask) { if (card->ext_csd.cmdq_en) { ret = mmc_cmdq_disable(card); if (ret) @@ -891,9 +892,10 @@ 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; int ret = 0; - if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) { + if ((part_type & mask) == mask) { mmc_retune_unpause(card->host); if (card->reenable_cmdq && !card->ext_csd.cmdq_en) ret = mmc_cmdq_enable(card); @@ -3185,4 +3187,3 @@ module_exit(mmc_blk_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver"); - |