xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'mmc-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

Browse Source 
Pull MMC fixes from Ulf Hansson:
 "MMC core:
   - Prevent bus reference leak in mmc_blk_init()

  MMC host:
   - tmio: Fix error handling when issuing CMD23
   - jz4740: Fix race condition in IRQ mask update"

* tag 'mmc-v4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: tmio: Fix error handling when issuing CMD23
  mmc: core: Prevent bus reference leak in mmc_blk_init()
  mmc: jz4740: Fix race condition in IRQ mask update
This commit is contained in:
Linus Torvalds
2018-04-12 10:59:03 -07:00
parent cb098d50ec fc167daff5
commit d1cb7718cf
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mmc/core/block.c
View File

@@ -3080,6 +3080,7 @@ static void __exit mmc_blk_exit(void)
mmc_unregister_driver(&mmc_driver); mmc_unregister_driver(&mmc_driver);
unregister_blkdev(MMC_BLOCK_MAJOR, "mmc"); unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");
unregister_chrdev_region(mmc_rpmb_devt, MAX_DEVICES); unregister_chrdev_region(mmc_rpmb_devt, MAX_DEVICES);
bus_unregister(&mmc_rpmb_bus_type);
} }
module_init(mmc_blk_init); module_init(mmc_blk_init);

2
drivers/mmc/host/jz4740_mmc.c
View File

@@ -362,9 +362,9 @@ static void jz4740_mmc_set_irq_enabled(struct jz4740_mmc_host *host,
host->irq_mask &= ~irq; host->irq_mask &= ~irq;
else else
host->irq_mask |= irq; host->irq_mask |= irq;
spin_unlock_irqrestore(&host->lock, flags);
writew(host->irq_mask, host->base + JZ_REG_MMC_IMASK); writew(host->irq_mask, host->base + JZ_REG_MMC_IMASK);
spin_unlock_irqrestore(&host->lock, flags);
} }
static void jz4740_mmc_clock_enable(struct jz4740_mmc_host *host, static void jz4740_mmc_clock_enable(struct jz4740_mmc_host *host,

2
drivers/mmc/host/tmio_mmc_core.c
View File

@@ -913,7 +913,7 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host)
host->check_scc_error(host); host->check_scc_error(host);
/* If SET_BLOCK_COUNT, continue with main command */ /* If SET_BLOCK_COUNT, continue with main command */
if (host->mrq) { if (host->mrq && !mrq->cmd->error) {
tmio_process_mrq(host, mrq); tmio_process_mrq(host, mrq);
return; return;
} }