mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 01:20:54 +00:00
Revert "ALSA: sb: fix a missing check of snd_ctl_add"
[ Upstream commit4b059ce1f4
] This reverts commitbeae77170c
. Because of recent interactions with developers from @umn.edu, all commits from them have been recently re-reviewed to ensure if they were correct or not. Upon review, this commit was found to be incorrect for the reasons below, so it must be reverted. It is safe to ignore this error as the mixer element is optional, and the driver is very legacy. Cc: Aditya Pakki <pakki001@umn.edu> Reviewed-by: Takashi Iwai <tiwai@suse.de> Link: https://lore.kernel.org/r/20210503115736.2104747-8-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
870a11325e
commit
6bbcc1206c
1 changed files with 3 additions and 7 deletions
|
@ -846,14 +846,10 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device)
|
|||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops);
|
||||
|
||||
if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) {
|
||||
err = snd_ctl_add(card, snd_ctl_new1(
|
||||
&snd_sb16_dma_control, chip));
|
||||
if (err)
|
||||
return err;
|
||||
} else {
|
||||
if (chip->dma16 >= 0 && chip->dma8 != chip->dma16)
|
||||
snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip));
|
||||
else
|
||||
pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
|
||||
}
|
||||
|
||||
snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
|
||||
card->dev, 64*1024, 128*1024);
|
||||
|
|
Loading…
Reference in a new issue