summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorNicolas Graziano <nicolas.graziano@wanadoo.fr>2005-08-22 13:47:16 +0200
committerJaroslav Kysela <perex@suse.cz>2005-08-30 08:46:59 +0200
commit9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd (patch)
treeda7a9da8ac95c9ed30eb0aafd4ceb2dd9efcacc1 /sound/pci
parent66d10647feb32178e1204d5b5c7126b1731efe9c (diff)
downloadlinux-stable-9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd.tar.gz
linux-stable-9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd.tar.bz2
linux-stable-9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd.zip
[ALSA] hda-intel - correct a bug in detection of rate supported
HDA Codec driver The insertion of the rate 9600 make a shift in detection of supported rate, put this rate at the end of the list. Signed-off-by: Nicolas Graziano <nicolas.graziano@wanadoo.fr> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/hda_codec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index 6bfb081d12dd..e067a14a2d9e 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -1165,8 +1165,9 @@ int snd_hda_build_controls(struct hda_bus *bus)
*/
static unsigned int rate_bits[][3] = {
/* rate in Hz, ALSA rate bitmask, HDA format value */
+
+ /* autodetected value used in snd_hda_query_supported_pcm */
{ 8000, SNDRV_PCM_RATE_8000, 0x0500 }, /* 1/6 x 48 */
- { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
{ 11025, SNDRV_PCM_RATE_11025, 0x4300 }, /* 1/4 x 44 */
{ 16000, SNDRV_PCM_RATE_16000, 0x0200 }, /* 1/3 x 48 */
{ 22050, SNDRV_PCM_RATE_22050, 0x4100 }, /* 1/2 x 44 */
@@ -1177,6 +1178,9 @@ static unsigned int rate_bits[][3] = {
{ 96000, SNDRV_PCM_RATE_96000, 0x0800 }, /* 2 x 48 */
{ 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */
{ 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */
+
+ /* not autodetected value */
+ { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
{ 0 }
};