Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-03 01:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

MMC host:

Browse Source 
- mediatek: Fix incorrect register write for tunings
  - bcm2835: Fixup leakage of DMA channel on probe errors
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEugLDXPmKSktSkQsV/iaEJXNYjCkFAlxUBucXHHVsZi5oYW5z
 c29uQGxpbmFyby5vcmcACgkQ/iaEJXNYjCmfxBAAmPUasE3SZQGyNIkf2P3xYflp
 ycJa/0l/b3GaL84omtAzwLc9F03DrDm0h3piQfWXvlU8PO1uxx3Hz/dTSlUWxruy
 jGSI7i9m30vfRfmnrXUnuEHWhxrR10hTzBp1sI2uyfbM9qiTvHxoiwQHw7H+eCEG
 uQ0VP41jENq60ositoOYbO2xntoaCnnqKLEotc116ekBrO28aUs6McXg+AtKtjSG
 ssY9FTBsXo3Dc/1uj0vRJPZlDQBfl0H7eCnHaobdgtqNeLGw441EChWR0xQAUNNd
 zrMI4mv00wjljLiFVSOaqH/+B52JXJrdYJrmjLTKrhJIv/hkEt6C0nQk8vd7V1Pw
 F5VrpNTzTW54i1FvArwaX72VCWL/mWwOyVcUYDLoh5tkLgV7PuXtQfjjzwt97Hsn
 qRVjX3mR0bueaLriKxNEh5tuMeHt5NMEhmWDzsyBHZ7PRCemVnJPcHgqw/JxoTri
 FN14cjU7FH8YSNIv+5xZ3ADbKI8C0Z1CHLuQsB6p0J2LJiWi6Tc3RuWXwO5VC3Xx
 QupcRVw6MviHH5379dr9Yb7cvbR9eWeI33z2eepamM1PFc+54FJKv7tZpd0MO4tZ
 RS5Vi8qgWieL9Flx3EvCxsodrV9Sgd1qwD4vW0o/jdOqQhuT+UtOyyxFY7sB3TnO
 LEMu/BUFayH2+6Kq4vY=
 =kWI8
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2019-02-01 10:19:50 -08:00
commit cca2e06ae8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
drivers/mmc/host/mtk-sd.c
View File

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