Re: [PATCH 3.4 035/172] ALSA: hdspm - Constrain periods to 2 on older cards

Adrian Knoth
2015-06-16T09:55:16Z

On 06/16/15 10:34, lizf@kernel.org wrote:

> From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
> 3.4.108-rc1 review patch. If anyone has any objections, please let me
> know.

I do.

> commit f0153c3d948c1764f6c920a0675d86fc1d75813e upstream.
>
> diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
> index bc030a2..0627ffe 100644
> --- a/sound/pci/rme9652/hdspm.c
> +++ b/sound/pci/rme9652/hdspm.c
> @@ -6042,6 +6042,12 @@ static int snd_hdspm_capture_open(struct snd_pcm_substream *substream)
> snd_pcm_hw_constraint_minmax(runtime,
> SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
> 64, 8192);
> + snd_pcm_hw_constraint_minmax(runtime,
> + SNDRV_PCM_HW_PARAM_PERIODS,
> + 2, 2);
> + snd_pcm_hw_constraint_minmax(runtime,
> + SNDRV_PCM_HW_PARAM_PERIODS,
> + 2, 2);
> break;
> }

This is not correct, those lines need to go to two different functions
(snd_hdspm_playback_open and snd_hdspm_capture_open).

Here is how the patch should look like:

diff -u -r old/hdspm.c new/hdspm.c
--- old/hdspm.c 2015-06-16 11:41:37.070389307 +0200
+++ new/hdspm.c 2015-06-16 11:44:02.101257093 +0200
@@ -6114,6 +6114,9 @@
snd_pcm_hw_constraint_minmax(runtime,
SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
64, 8192);
+ snd_pcm_hw_constraint_minmax(runtime,
+ SNDRV_PCM_HW_PARAM_PERIODS,
+ 2, 2);
break;
}

@@ -6188,6 +6191,9 @@
snd_pcm_hw_constraint_minmax(runtime,
SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
64, 8192);
+ snd_pcm_hw_constraint_minmax(runtime,
+ SNDRV_PCM_HW_PARAM_PERIODS,
+ 2, 2);
break;
}