Eric Biggers b05e7404b7 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: 2b0f7f511d ("Merge b3a6082223 ("Merge branch 'for-v5.6' of git://git.kernel.org:/pub/scm/linux/kernel/git/jmorris/linux-security") into android-mainline")
Fixes: 89ff7d0c86 ("ANDROID: ASoC: core: Fix soc_pcm_hw_params crash")
Fixes: da171b5d56 ("ANDROID: Revert "ANDROID: ASoC: core - add hostless DAI support"")
Change-Id: Ib78167c5f60f5d8a0def25dce70e7597e8aeaedb
Signed-off-by: Eric Biggers <ebiggers@google.com>

2020-08-17 08:24:52 +00:00

..

ac97

ALSA: ac97: Constify snd_ac97_bus_ops definitions

2020-01-03 09:24:11 +01:00

aoa

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

arm

ASoC: arm: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointer

2020-03-27 14:44:56 +00:00

atmel

ALSA: atmel: Remove invalid "fall through" comments

2020-07-09 19:10:11 +02:00

core

Merge tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2020-08-06 14:27:31 -07:00

drivers

Merge tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2020-08-06 14:27:31 -07:00

firewire

ALSA: firewire: fix kernel-doc

2020-07-07 12:09:32 +02:00

hda

ALSA: hda: Add dma stop delay variable

2020-08-05 12:27:47 +02:00

i2c

ALSA: i2c: Constify snd_kcontrol_new items

2020-01-03 09:24:24 +01:00

isa

Merge tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2020-08-06 14:27:31 -07:00

mips

ALSA: sgio2audio: Remove usage of dropped hw_params/hw_free functions

2020-03-06 12:06:41 +01:00

oss

ALSA: Use fallthrough pseudo-keyword

2020-07-09 13:01:29 +02:00

parisc

Merge tag 'sound-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2020-01-28 16:26:57 -08:00

pci

ALSA: echoaudio: Fix potential Oops in snd_echo_resume()

2020-08-13 11:21:05 +02:00

pcmcia

ALSA: Use fallthrough pseudo-keyword

2020-07-09 13:01:29 +02:00

ppc

ALSA: Replace the word "slave" in vmaster API

2020-07-20 10:10:47 +02:00

sh

ALSA: sh: Fix compile warning wrt const

2020-01-05 16:15:14 +01:00

soc

ANDROID: fix up bad merge resolution / bad revert in soc_pcm_hw_params()

2020-08-17 08:24:52 +00:00

sparc

ALSA: Replace HTTP links with HTTPS ones

2020-07-19 20:49:25 +02:00

spi

ALSA: spi: More constification

2020-01-05 16:15:13 +01:00

synth

ALSA: emux: More constifications

2020-01-05 16:14:46 +01:00

usb

Merge 4b6c093e21 ("Merge tag 'block-5.9-2020-08-14' of git://git.kernel.dk/linux-block") into android-mainline

2020-08-17 09:19:35 +02:00

x86

treewide: replace '---help---' in Kconfig files with 'help'

2020-06-14 01:57:21 +09:00

xen

ALSA: xen: Remove superfluous fall through comments

2020-07-09 19:10:37 +02:00

ac97_bus.c

ALSA: ac97: Treat snd_ac97_bus_ops as const

2020-01-03 09:24:08 +01:00

Kconfig

treewide: Add SPDX license identifier - Makefile/Kconfig

2019-05-21 10:50:46 +02:00

last.c

treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 156

2019-05-30 11:26:35 -07:00

Makefile

…

sound_core.c

sound: fix a memory leak bug

2019-08-08 08:18:32 +02:00