tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'mmc-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Pull MMC fixes from Ulf Hansson:
"MMC core:
- Fix use-after-free issue for rpmb partition

MMC host:
- Fix quirk for broken CQE support"

* tag 'mmc-v5.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
mmc: block: Fix use-after-free issue for rpmb
mmc: sdhci: Fix SDHCI_QUIRK_BROKEN_CQE

Linus Torvalds 411ea679 d54b64ef

+7 -4
+1 -1
drivers/mmc/core/block.c
··· 2484 2484 struct mmc_rpmb_data *rpmb = container_of(inode->i_cdev, 2485 2485 struct mmc_rpmb_data, chrdev); 2486 2486 2487 - put_device(&rpmb->dev); 2488 2487 mmc_blk_put(rpmb->md); 2488 + put_device(&rpmb->dev); 2489 2489 2490 2490 return 0; 2491 2491 }
+6 -3
drivers/mmc/host/sdhci.c
··· 4000 4000 mmc_hostname(mmc), host->version); 4001 4001 } 4002 4002 4003 - if (host->quirks & SDHCI_QUIRK_BROKEN_CQE) 4004 - mmc->caps2 &= ~MMC_CAP2_CQE; 4005 - 4006 4003 if (host->quirks & SDHCI_QUIRK_FORCE_DMA) 4007 4004 host->flags |= SDHCI_USE_SDMA; 4008 4005 else if (!(host->caps & SDHCI_CAN_DO_SDMA)) ··· 4535 4538 unsigned int flags = WQ_UNBOUND | WQ_MEM_RECLAIM | WQ_HIGHPRI; 4536 4539 struct mmc_host *mmc = host->mmc; 4537 4540 int ret; 4541 + 4542 + if ((mmc->caps2 & MMC_CAP2_CQE) && 4543 + (host->quirks & SDHCI_QUIRK_BROKEN_CQE)) { 4544 + mmc->caps2 &= ~MMC_CAP2_CQE; 4545 + mmc->cqe_ops = NULL; 4546 + } 4538 4547 4539 4548 host->complete_wq = alloc_workqueue("sdhci", flags, 0); 4540 4549 if (!host->complete_wq)