]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-stac925x-init-fix
Revert "Move xen patchset to new version's subdir."
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.drivers / alsa-hda-stac925x-init-fix
diff --git a/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-stac925x-init-fix b/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-stac925x-init-fix
deleted file mode 100644 (file)
index 7cbc635..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-From c9280d681c4093405fc896dc25f81d5ff9de8183 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Thu, 15 Jan 2009 17:31:00 +0100
-Subject: ALSA: hda - Fix (yet more) STAC925x issues
-Patch-mainline: 2.6.29-rc1
-References: bnc#460478
-
-The codec-parsing of STAC925x was utterly broken due to its unique
-design unlike other STAC codecs.  It has a volume control only in NID
-0x0e (similar as STAC9200), but the parser assumes that the amp is
-available on each DAC widget.
-
-The patch fixes the whole wrong stories: fix the initial volume,
-assign the fixed "Master" volume, and avoid to create wrong volume
-controls.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/pci/hda/patch_sigmatel.c |   16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
---- a/sound/pci/hda/patch_sigmatel.c
-+++ b/sound/pci/hda/patch_sigmatel.c
-@@ -902,6 +902,8 @@ static struct hda_verb stac92hd71bxx_ana
- static struct hda_verb stac925x_core_init[] = {
-       /* set dac0mux for dac converter */
-       { 0x06, AC_VERB_SET_CONNECT_SEL, 0x00},
-+      /* mute the master volume */
-+      { 0x0e, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE },
-       {}
- };
-@@ -1153,6 +1155,8 @@ static struct snd_kcontrol_new stac92hd7
- };
- static struct snd_kcontrol_new stac925x_mixer[] = {
-+      HDA_CODEC_VOLUME("Master Playback Volume", 0x0e, 0, HDA_OUTPUT),
-+      HDA_CODEC_MUTE("Master Playback Switch", 0x0e, 0, HDA_OUTPUT),
-       STAC_INPUT_SOURCE(1),
-       HDA_CODEC_VOLUME("Capture Volume", 0x09, 0, HDA_OUTPUT),
-       HDA_CODEC_MUTE("Capture Switch", 0x14, 0, HDA_OUTPUT),
-@@ -3492,14 +3496,14 @@ static int stac92xx_parse_auto_config(st
-       if ((err = stac92xx_add_dyn_out_pins(codec, &spec->autocfg)) < 0)
-               return err;
--      if (spec->multiout.num_dacs == 0)
-+      if (spec->multiout.num_dacs == 0) {
-               if ((err = stac92xx_auto_fill_dac_nids(codec, &spec->autocfg)) < 0)
-                       return err;
--
--      err = stac92xx_auto_create_multi_out_ctls(codec, &spec->autocfg);
--
--      if (err < 0)
--              return err;
-+              err = stac92xx_auto_create_multi_out_ctls(codec,
-+                                                        &spec->autocfg);
-+              if (err < 0)
-+                      return err;
-+      }
-       /* setup analog beep controls */
-       if (spec->anabeep_nid > 0) {