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

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

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

Pull MMC host fixes from Ulf Hansson:

 - mediatek: Fix incorrect register write for tunings

 - bcm2835: Fixup leakage of DMA channel on probe errors

* tag 'mmc-v5.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: mediatek: fix incorrect register setting of hs400_cmd_int_delay
  mmc: bcm2835: Fix DMA channel leak on probe error
parents 520fac05 3751e008

drivers/mmc/host/bcm2835.c

+2 −0
Original line number Diff line number Diff line
@@ -1431,6 +1431,8 @@ static int bcm2835_probe(struct platform_device *pdev) 


err:

	dev_dbg(dev, "%s -> err %d\n", __func__, ret);

	if (host->dma_chan_rxtx)

		dma_release_channel(host->dma_chan_rxtx);

	mmc_free_host(mmc);



	return ret;

drivers/mmc/host/mtk-sd.c

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz) 


	if (timing == MMC_TIMING_MMC_HS400 &&

	    host->dev_comp->hs400_tune)

		sdr_set_field(host->base + PAD_CMD_TUNE,

		sdr_set_field(host->base + tune_reg,

			      MSDC_PAD_TUNE_CMDRRDLY,

			      host->hs400_cmd_int_delay);

	dev_dbg(host->dev, "sclk: %d, timing: %d\n", host->mmc->actual_clock,