aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Graziano <nicolas.graziano@wanadoo.fr>2005-08-22 07:47:16 -0400
committerJaroslav Kysela <perex@suse.cz>2005-08-30 02:46:59 -0400
commit9d8f53f2bba3c2c06e1e78126222aecf91f8ecdd (patch)
treeda7a9da8ac95c9ed30eb0aafd4ceb2dd9efcacc1
parent66d10647feb32178e1204d5b5c7126b1731efe9c (diff)
[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>
-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)
1165 */ 1165 */
1166static unsigned int rate_bits[][3] = { 1166static unsigned int rate_bits[][3] = {
1167 /* rate in Hz, ALSA rate bitmask, HDA format value */ 1167 /* rate in Hz, ALSA rate bitmask, HDA format value */
1168
1169 /* autodetected value used in snd_hda_query_supported_pcm */
1168 { 8000, SNDRV_PCM_RATE_8000, 0x0500 }, /* 1/6 x 48 */ 1170 { 8000, SNDRV_PCM_RATE_8000, 0x0500 }, /* 1/6 x 48 */
1169 { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
1170 { 11025, SNDRV_PCM_RATE_11025, 0x4300 }, /* 1/4 x 44 */ 1171 { 11025, SNDRV_PCM_RATE_11025, 0x4300 }, /* 1/4 x 44 */
1171 { 16000, SNDRV_PCM_RATE_16000, 0x0200 }, /* 1/3 x 48 */ 1172 { 16000, SNDRV_PCM_RATE_16000, 0x0200 }, /* 1/3 x 48 */
1172 { 22050, SNDRV_PCM_RATE_22050, 0x4100 }, /* 1/2 x 44 */ 1173 { 22050, SNDRV_PCM_RATE_22050, 0x4100 }, /* 1/2 x 44 */
@@ -1177,6 +1178,9 @@ static unsigned int rate_bits[][3] = {
1177 { 96000, SNDRV_PCM_RATE_96000, 0x0800 }, /* 2 x 48 */ 1178 { 96000, SNDRV_PCM_RATE_96000, 0x0800 }, /* 2 x 48 */
1178 { 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */ 1179 { 176400, SNDRV_PCM_RATE_176400, 0x5800 },/* 4 x 44 */
1179 { 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */ 1180 { 192000, SNDRV_PCM_RATE_192000, 0x1800 }, /* 4 x 48 */
1181
1182 /* not autodetected value */
1183 { 9600, SNDRV_PCM_RATE_KNOT, 0x0400 }, /* 1/5 x 48 */
1180 { 0 } 1184 { 0 }
1181}; 1185};
1182 1186