From b05e7404b71a8a1734c5c848fdaadee640c42b2c Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 14 Aug 2020 12:19:02 -0700 Subject: [PATCH] ANDROID: fix up bad merge resolution / bad revert in soc_pcm_hw_params() A bad merge resolution of upstream with "ANDROID: ASoC: core - add hostless DAI support" resulted in some code being duplicated in soc_pcm_hw_params(). The conflicting out-of-tree patch later got reverted, but the duplicate code still remains. Remove it. This makes the code match upstream. Bug: 144369166 Fixes: 2b0f7f511da4 ("Merge b3a608222336 ("Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security") into android-mainline") Fixes: 89ff7d0c8625 ("ANDROID: ASoC: core: Fix soc_pcm_hw_params crash") Fixes: da171b5d560c ("ANDROID: Revert "ANDROID: ASoC: core - add hostless DAI support"") Change-Id: Ib78167c5f60f5d8a0def25dce70e7597e8aeaedb Signed-off-by: Eric Biggers --- sound/soc/soc-pcm.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 20a45b2ca16b..00ac1cbf6f88 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -919,15 +919,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, if (ret) goto out; - if (rtd->dai_link->ops && rtd->dai_link->ops->hw_params) { - ret = rtd->dai_link->ops->hw_params(substream, params); - if (ret < 0) { - dev_err(rtd->card->dev, "ASoC: machine hw_params" - " failed: %d\n", ret); - goto out; - } - } - ret = snd_soc_link_hw_params(substream, params); if (ret < 0) goto out;