mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

MMC host:

Browse source 
- mtk-sd: Fix memory leak during tuning
  - renesas_sdhi: Initialize variable properly when tuning
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAmGzIyIXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCmEfA//cKIKY5DdsiQcw/jwZlb9zvyn
 iHQxnrmLQ/fQTrPrzUYvwTEfuPUIMuhX3mo6gNijr0bBPHQ//6LN/yuq+45ZISmK
 ehVOa9bOp5kC0Uw9FF2y3ZrINVIep6k5yp27HDPhZ96qX/xLKH+905tdX13Md5c4
 Wzw1aiYcK5kb69HDYplg2WXKyws+i2mCsA8RhX+S0ZKFPAk0a5SWyT4A47zgoVOz
 02SPQtx/9j7yk14bt2ih/WgsfDq6tTJ+mel6YWjYkneu3JEhyUsq4rIh9bDunGT5
 ycjM6rEji8bue0at+1xCYzV/LIYBJHB6Y4Lp2dT6rGOEYCZxbQHuuJydg0OBRQMR
 bKmfogsJjZKCgN3CK2NTJkBOv5yV7nFzXOcU/W5FNgJlBmKUzkSPFdW0c4BZQMyI
 x2wRI/UutyceSJfpxM4EcSW1/CNqJhS1VgJowu1U7G5dYrZvJnZlvmeq030a2pwo
 t1vFHHAhgkJ7etRctTZBPdVOB/3xaDyYG0FOyyQqhhGzFw1mAILgGZowq8IA/p1w
 5b9ynHYDVsBPJ4TeB50JjGxPOvuJjqYRhqlCRj08YBdRvWUJACOtmYo/sedwKZxE
 Cp3awLefVgAuUuhvPsqZOg5pd5IvyVpGTbBIfLUIJZb6I40Ub7QopE+WK3ixNHr8
 u6l7nmsP5PtDgVB+TBU=
 =nakq
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2021-12-10 11:50:21 -08:00
commit 2ca4b65169
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mmc/host/mtk-sd.c
View file

@ -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;

2
drivers/mmc/host/renesas_sdhi_core.c
View file

@ -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);