Skip to contentSkip to conversation

snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs

PATCH Applied Ondrej Zary 2 participants 2 messages Oct 29, 2015 – Oct 30, 2015 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs

Currently, the Duplicate front control is enabled only for two specific revisions of CS4294.

Enable it for all CS4294 and CS4298 codecs instead.

This fixes rear output on my VC-4620N sound card
(CS4620 + CS4298 rev.5).

---
 sound/pci/cs46xx/cs46xx_lib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/cs46xx/cs46xx_lib.c +1 -1
index 2a9f4a3..e62c841 100644
@@ -2528,7 +2528,7 @@ int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
 	if (chip->nr_ac97_codecs == 1) {
 		unsigned int id2 = chip->ac97[CS46XX_PRIMARY_CODEC_INDEX]->id & 0xffff;
-		if (id2 == 0x592b || id2 == 0x592d) {
+		if ((id2 & 0xfff0) == 0x5920) {	/* CS4294 and CS4298 */
 			err = snd_ctl_add(card, snd_ctl_new1(&snd_cs46xx_front_dup_ctl, chip));
 			if (err < 0)
 				return err;
Signature · 1 line
Ondrej Zary
Applied
#1 lore raw
Quoted 10 lines · Ondrej Zary

Currently, the Duplicate front control is enabled only for two specific revisions of CS4294.

Enable it for all CS4294 and CS4298 codecs instead.

This fixes rear output on my VC-4620N sound card
(CS4620 + CS4298 rev.5).

Applied, thanks.

Takashi

Quoted 22 lines
---
 sound/pci/cs46xx/cs46xx_lib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/cs46xx/cs46xx_lib.c +1 -1
index 2a9f4a3..e62c841 100644
@@ -2528,7 +2528,7 @@ int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
 	if (chip->nr_ac97_codecs == 1) {
 		unsigned int id2 = chip->ac97[CS46XX_PRIMARY_CODEC_INDEX]->id & 0xffff;
-		if (id2 == 0x592b || id2 == 0x592d) {
+		if ((id2 & 0xfff0) == 0x5920) {	/* CS4294 and CS4298 */
 			err = snd_ctl_add(card, snd_ctl_new1(&snd_cs46xx_front_dup_ctl, chip));
 			if (err < 0)
 				return err;
Signature · 3 lines
Ondrej Zary

.