Commit 2deaeaf1 authored Jun 14, 2017 by Takashi Iwai

ALSA: pcm: Don't treat NULL chmap as a fatal error



The standard PCM chmap helper callbacks treat the NULL info->chmap as
a fatal error and spews the kernel warning with stack trace when
CONFIG_SND_DEBUG is on.  This was OK, originally it was supposed to be
always static and non-NULL.  But, as the recent addition of Intel LPE
audio driver shows, the chmap content may vary dynamically, and it can
be even NULL when disconnected.  The user still sees the kernel
warning unnecessarily.

For clearing such a confusion, this patch simply removes the
snd_BUG_ON() in each place, just returns an error without warning.

Cc: <stable@vger.kernel.org> # v4.11+
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent e79b0006

sound/core/pcm_lib.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2492,7 +2492,7 @@ static int pcm_chmap_ctl_get(struct snd_kcontrol *kcontrol,
		struct snd_pcm_substream *substream;
		const struct snd_pcm_chmap_elem *map;

		if (snd_BUG_ON(!info->chmap))
		if (!info->chmap)
		return -EINVAL;
		substream = snd_pcm_chmap_substream(info, idx);
		if (!substream)
		@@ -2524,7 +2524,7 @@ static int pcm_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
		unsigned int __user *dst;
		int c, count = 0;

		if (snd_BUG_ON(!info->chmap))
		if (!info->chmap)
		return -EINVAL;
		if (size < 8)
		return -ENOMEM;

Admin message