Commit 2ca4b651 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MMC host fixes from Ulf Hansson:

 - mtk-sd: Fix memory leak during tuning

 - renesas_sdhi: Initialize variable properly when tuning

* tag 'mmc-v5.16-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: mediatek: free the ext_csd when mmc_get_ext_csd success
  mmc: renesas_sdhi: initialize variable properly when tuning
parents bec8cb26 d594b35d

drivers/mmc/host/mtk-sd.c

+3 −1
Original line number Diff line number Diff line
@@ -2291,8 +2291,10 @@ static int msdc_execute_hs400_tuning(struct mmc_host *mmc, struct mmc_card *card 
			sdr_set_field(host->base + PAD_DS_TUNE,

				      PAD_DS_TUNE_DLY1, i);

		ret = mmc_get_ext_csd(card, &ext_csd);

		if (!ret)

		if (!ret) {

			result_dly1 |= (1 << i);

			kfree(ext_csd);

		}

	}

	host->hs400_tuning = false;

drivers/mmc/host/renesas_sdhi_core.c

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode) 


	/* Issue CMD19 twice for each tap */

	for (i = 0; i < 2 * priv->tap_num; i++) {

		int cmd_error;

		int cmd_error = 0;



		/* Set sampling clock position */

		sd_scc_write32(host, priv, SH_MOBILE_SDHI_SCC_TAPSET, i % priv->tap_num);