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: 2b0f7f51 ("Merge b3a60822 ("Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security" ) into android-mainline") Fixes: 89ff7d0c ("ANDROID: ASoC: core: Fix soc_pcm_hw_params crash") Fixes: da171b5d ("ANDROID: Revert "ANDROID: ASoC: core - add hostless DAI support"") Change-Id: Ib78167c5f60f5d8a0def25dce70e7597e8aeaedb Signed-off-by:Eric Biggers <ebiggers@google.com>
Loading
Please sign in to comment