openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: fix params_rate() macro use in several codecs 

Sevelar ASoC codec drivers wrongly assume, that the params_rate() macro
returns one of SNDRV_PCM_RATE_* defines instead of the actual numerical
sampling rate. Fix them.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
This commit is contained in:
Guennadi Liakhovetski 2009-12-24 01:13:51 +01:00 committed by Mark Brown
parent 18f98ab547
commit b3172f222a
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/codecs/wm8510.c
View File

@ -424,23 +424,23 @@ static int wm8510_pcm_hw_params(struct snd_pcm_substream *substream,
/* filter coefficient */
switch (params_rate(params)) {
case SNDRV_PCM_RATE_8000:
case 8000:
adn |= 0x5 << 1;
break;
case SNDRV_PCM_RATE_11025:
case 11025:
adn |= 0x4 << 1;
break;
case SNDRV_PCM_RATE_16000:
case 16000:
adn |= 0x3 << 1;
break;
case SNDRV_PCM_RATE_22050:
case 22050:
adn |= 0x2 << 1;
break;
case SNDRV_PCM_RATE_32000:
case 32000:
adn |= 0x1 << 1;
break;
case SNDRV_PCM_RATE_44100:
case SNDRV_PCM_RATE_48000:
case 44100:
case 48000:
break;
}

14
sound/soc/codecs/wm8940.c
View File

@ -378,23 +378,23 @@ static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream,
iface |= (1 << 9);
switch (params_rate(params)) {
case SNDRV_PCM_RATE_8000:
case 8000:
addcntrl |= (0x5 << 1);
break;
case SNDRV_PCM_RATE_11025:
case 11025:
addcntrl |= (0x4 << 1);
break;
case SNDRV_PCM_RATE_16000:
case 16000:
addcntrl |= (0x3 << 1);
break;
case SNDRV_PCM_RATE_22050:
case 22050:
addcntrl |= (0x2 << 1);
break;
case SNDRV_PCM_RATE_32000:
case 32000:
addcntrl |= (0x1 << 1);
break;
case SNDRV_PCM_RATE_44100:
case SNDRV_PCM_RATE_48000:
case 44100:
case 48000:
break;
}
ret = snd_soc_write(codec, WM8940_ADDCNTRL, addcntrl);

14
sound/soc/codecs/wm8974.c
View File

@ -482,23 +482,23 @@ static int wm8974_pcm_hw_params(struct snd_pcm_substream *substream,
/* filter coefficient */
switch (params_rate(params)) {
case SNDRV_PCM_RATE_8000:
case 8000:
adn |= 0x5 << 1;
break;
case SNDRV_PCM_RATE_11025:
case 11025:
adn |= 0x4 << 1;
break;
case SNDRV_PCM_RATE_16000:
case 16000:
adn |= 0x3 << 1;
break;
case SNDRV_PCM_RATE_22050:
case 22050:
adn |= 0x2 << 1;
break;
case SNDRV_PCM_RATE_32000:
case 32000:
adn |= 0x1 << 1;
break;
case SNDRV_PCM_RATE_44100:
case SNDRV_PCM_RATE_48000:
case 44100:
case 48000:
break;
}