Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1258962 > unrolled thread

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

Started byOndrej Zary <linux@rainbow-software.org>
First post2015-10-29 20:30 +0100
Last post2015-10-30 12:40 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs Ondrej Zary <linux@rainbow-software.org> - 2015-10-29 20:30 +0100
    Re: [PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs Takashi Iwai <tiwai@suse.de> - 2015-10-30 12:40 +0100

#1258962 — [PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs

FromOndrej Zary <linux@rainbow-software.org>
Date2015-10-29 20:30 +0100
Subject[PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs
Message-ID<qp13A-4m5-9@gated-at.bofh.it>
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).

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
 sound/pci/cs46xx/cs46xx_lib.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 2a9f4a3..e62c841 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -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;
-- 
Ondrej Zary

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1259415

FromTakashi Iwai <tiwai@suse.de>
Date2015-10-30 12:40 +0100
Message-ID<qpgch-5f8-5@gated-at.bofh.it>
In reply to#1258962
On Thu, 29 Oct 2015 20:22:06 +0100,
Ondrej Zary wrote:
> 
> 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).
> 
> Signed-off-by: Ondrej Zary <linux@rainbow-software.org>

Applied, thanks.


Takashi

> ---
>  sound/pci/cs46xx/cs46xx_lib.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
> index 2a9f4a3..e62c841 100644
> --- a/sound/pci/cs46xx/cs46xx_lib.c
> +++ b/sound/pci/cs46xx/cs46xx_lib.c
> @@ -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;
> -- 
> Ondrej Zary
> 
> .
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web