[PATCH] [UBUNTU:sound/pci/hda/] Fix missing terminators in AD1988 mixer models (patch_analog)

crimsun at fungus.sh.nu crimsun at fungus.sh.nu
Fri Jul 7 01:12:30 UTC 2006


Subject: [PATCH] [UBUNTU:sound/pci/hda/] Fix missing terminators in AD1988 mixer models (patch_analog)

UpstreamStatus: Added in upstream alsa-kernel hg changeset f1783110d6d9
                http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=f1783110d6d9f4a95b59d4cd58cfb5e3c5db26a9;style=raw

Takashi Iwai readded the missing terminators in various AD1988 mixer
models.

This patch is tailored for Dapper's Linux source and will be fuzzy for Edgy's.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>

---

 sound/pci/hda/patch_analog.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

7e837ab19db4a10f731d9927a32265510325498d
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c
index 00d91df..23e6d39 100644
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -1628,6 +1628,7 @@ static snd_kcontrol_new_t ad1988_6stack_
 	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME("Side Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
+	{ } /* end */
 };
 
 static snd_kcontrol_new_t ad1988_6stack_mixers1_rev2[] = {
@@ -1636,6 +1637,7 @@ static snd_kcontrol_new_t ad1988_6stack_
 	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x0a, 1, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x0a, 2, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME("Side Playback Volume", 0x06, 0x0, HDA_OUTPUT),
+	{ } /* end */
 };
 
 static snd_kcontrol_new_t ad1988_6stack_mixers2[] = {
@@ -1674,6 +1676,7 @@ static snd_kcontrol_new_t ad1988_3stack_
 	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x05, 1, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x05, 2, 0x0, HDA_OUTPUT),
+	{ } /* end */
 };
 
 static snd_kcontrol_new_t ad1988_3stack_mixers1_rev2[] = {
@@ -1681,6 +1684,7 @@ static snd_kcontrol_new_t ad1988_3stack_
 	HDA_CODEC_VOLUME("Surround Playback Volume", 0x0a, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME_MONO("Center Playback Volume", 0x06, 1, 0x0, HDA_OUTPUT),
 	HDA_CODEC_VOLUME_MONO("LFE Playback Volume", 0x06, 2, 0x0, HDA_OUTPUT),
+	{ } /* end */
 };
 
 static snd_kcontrol_new_t ad1988_3stack_mixers2[] = {
-- 
1.1.3


-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:   www.sh.nu/~crimsun/pubkey.gpg.asc
-------------- 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/20060706/7879fc3c/attachment.sig>


More information about the kernel-team mailing list