Commit b05e7404 authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

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: default avatarEric Biggers <ebiggers@google.com>
parent 2f22f2ce
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment