On Thu, Jul 12, 2018 at 08:33:10AM +0200, Greg KH wrote:
> On Wed, Jul 11, 2018 at 08:49:02PM +0100, Sudip Mukherjee wrote:
> > Hi Greg,
> >
> > Seems you have missed 5845e6155d8f4a4a9bae2d4c1d1bb4a4d9a925c2 in the
> > stable trees. No backport required, it will apply cleanly.
>
> It is already in 4.17.4 and does not apply to 4.14.y at all.
Apologies.
>
> You might want to check your scripts :)
I have seen you previously posting a link to your scripts in github,
I think I will sync up with them and adjust my scripts according to
the way you do. I will go and find that link now. :)
The attached patch should be good for v4.14.y.
--
Regards
Sudip
>From 230f2417ff97f0c9846623fe1171063b36a04882 Mon Sep 17 00:00:00 2001
From: Kai Chieh Chuang <kaichieh.chuang@xxxxxxxxxxxx>
Date: Fri, 27 Apr 2018 10:11:35 +0800
Subject: [PATCH] ASoC: mediatek: preallocate pages use platform device
commit 5845e6155d8f4a4a9bae2d4c1d1bb4a4d9a925c2 upstream
preallocate pages should use platform device,
since we set dma mask for platform device.
Signed-off-by: KaiChieh Chuang <kaichieh.chuang@xxxxxxxxxxxx>
Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>
---
sound/soc/mediatek/common/mtk-afe-platform-driver.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/mediatek/common/mtk-afe-platform-driver.c b/sound/soc/mediatek/common/mtk-afe-platform-driver.c
index 82d439c15f4e..e58fbefa5e6b 100644
--- a/sound/soc/mediatek/common/mtk-afe-platform-driver.c
+++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.c
@@ -63,13 +63,13 @@ static const struct snd_pcm_ops mtk_afe_pcm_ops = {
static int mtk_afe_pcm_new(struct snd_soc_pcm_runtime *rtd)
{
size_t size;
- struct snd_card *card = rtd->card->snd_card;
struct snd_pcm *pcm = rtd->pcm;
struct mtk_base_afe *afe = snd_soc_platform_get_drvdata(rtd->platform);
size = afe->mtk_afe_hardware->buffer_bytes_max;
return snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
- card->dev, size, size);
+ rtd->platform->dev,
+ size, size);
}
static void mtk_afe_pcm_free(struct snd_pcm *pcm)
--
2.11.0
