Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1cb7718 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents cb098d50 fc167daf

drivers/mmc/core/block.c

+1 −0
Original line number Diff line number Diff line
@@ -3080,6 +3080,7 @@ static void __exit mmc_blk_exit(void) 
	mmc_unregister_driver(&mmc_driver);

	unregister_blkdev(MMC_BLOCK_MAJOR, "mmc");

	unregister_chrdev_region(mmc_rpmb_devt, MAX_DEVICES);

	bus_unregister(&mmc_rpmb_bus_type);

}



module_init(mmc_blk_init);

drivers/mmc/host/jz4740_mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -362,9 +362,9 @@ static void jz4740_mmc_set_irq_enabled(struct jz4740_mmc_host *host, 
		host->irq_mask &= ~irq;

	else

		host->irq_mask |= irq;

	spin_unlock_irqrestore(&host->lock, flags);



	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,

drivers/mmc/host/tmio_mmc_core.c

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) 
		host->check_scc_error(host);



	/* If SET_BLOCK_COUNT, continue with main command */

	if (host->mrq) {

	if (host->mrq && !mrq->cmd->error) {

		tmio_process_mrq(host, mrq);

		return;

	}