[PATCH] [UBUNTU:sound/pci/] Fix inaudible sound by default for ENS1371

[crimsun at fungus.sh.nu]

From fd495d6f8d0eac1d4b738b733769cbc7388ee3b3 Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun at garnish.localdomain>
Date: Fri, 11 Aug 2006 19:09:23 -0400
Subject: [PATCH] [UBUNTU:sound/pci/] Fix inaudible sound by default for ENS1371

UpstreamStatus: Not yet merged

ENS1371 shouldn't advertise it can use VRA. By default it writes a
"supported" (1) bit into the Extended Status register (0x2a), causing
sound to be inaudible. Troubleshooting in #alsa/Freenode with Nachum
Kanovsky confirms that writing an "unsupported" (0) bit into the
Extended Status register restores audible sound.

The fix, therefore, is to disallow using VRA at all for ENS1371 by
making sure that its mixer is configured as such by default in
sound/pci/ens1370.c::snd_ensoniq_1371_mixer().

See also Nachum's comment in ALSA bug #1756.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 sound/pci/ens1370.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index 2daa575..3f8846b 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -1598,6 +1598,9 @@ static int snd_ensoniq_1371_mixer(ensoni
 	ac97.scaps = AC97_SCAP_AUDIO;
 	if ((err = snd_ac97_mixer(pbus, &ac97, &ensoniq->u.es1371.ac97)) < 0)
 		return err;
+	/* Ubuntu: ENS1371s shouldn't enable VRA */
+	snd_ac97_update_bits(ensoniq->u.es1371.ac97, AC97_EXTENDED_STATUS,
+		AC97_EA_VRA|AC97_EA_VRM, 0);
 	for (idx = 0; es1371_spdif_present[idx].vid != (unsigned short)PCI_ANY_ID; idx++)
 		if (ensoniq->pci->vendor == es1371_spdif_present[idx].vid &&
 		    ensoniq->pci->device == es1371_spdif_present[idx].did &&
-- 
1.4.1

-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:  0xC88ABDA3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20060811/1b43536f/attachment.sig>