Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3be522a9 authored by Jaroslav Kysela's avatar Jaroslav Kysela
Browse files

ALSA: pcm core - fix fifo_size channels interval check 



Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Cc: <stable@kernel.org>
parent f167e1d0

sound/core/pcm_native.c

+4 −4
Original line number Diff line number Diff line
@@ -315,10 +315,10 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream, 
	if (!params->info)

		params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;

	if (!params->fifo_size) {

		if (snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) ==

		    snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) &&

                    snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) ==

                    snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) {

		m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);

		i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);

		if (snd_mask_min(m) == snd_mask_max(m) &&

                    snd_interval_min(i) == snd_interval_max(i)) {

			changed = substream->ops->ioctl(substream,

					SNDRV_PCM_IOCTL1_FIFO_SIZE, params);

			if (changed < 0)