* [PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs
@ 2015-10-29 19:22 Ondrej Zary
2015-10-30 11:33 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Ondrej Zary @ 2015-10-29 19:22 UTC (permalink / raw)
To: alsa-devel; +Cc: Takashi Iwai, Kernel development list
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs
2015-10-29 19:22 [PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs Ondrej Zary
@ 2015-10-30 11:33 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2015-10-30 11:33 UTC (permalink / raw)
To: Ondrej Zary; +Cc: alsa-devel, Kernel development list
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
>
> .
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-30 11:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-29 19:22 [PATCH] snd-cs46xx: Fix Duplicate front for CS4294 and CS4298 codecs Ondrej Zary
2015-10-30 11:33 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox