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-hp-3013-master-fix

diff --git a/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-hp-3013-master-fix b/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-hp-3013-master-fix
deleted file mode 100644 (file)
index 10f3d34..0000000
--- a/src/patches/suse-2.6.27.31/patches.drivers/alsa-hda-hp-3013-master-fix
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-Subject: ALSA: hda - Fix ALC260 hp3013 master switch
-Patch-mainline: 
-References: bnc#441068
-
-The master switch doesn't influence on NID 0x15, the headphone jack
-on HP 3013 model because alc260_hp_master_update() ignores the passed
-arguments.
-
-Also, corrected the wrong arguments of hp3013 (0x10 and 0x15) although
-this doesn't change any behavior.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
- sound/pci/hda/patch_realtek.c |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -4159,13 +4159,13 @@ static void alc260_hp_master_update(stru
-       struct alc_spec *spec = codec->spec;
-       unsigned int val = spec->master_sw ? PIN_HP : 0;
-       /* change HP and line-out pins */
--      snd_hda_codec_write(codec, 0x0f, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-+      snd_hda_codec_write(codec, hp, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                           val);
--      snd_hda_codec_write(codec, 0x10, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-+      snd_hda_codec_write(codec, line, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                           val);
-       /* mono (speaker) depending on the HP jack sense */
-       val = (val && !spec->jack_present) ? PIN_OUT : 0;
--      snd_hda_codec_write(codec, 0x11, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-+      snd_hda_codec_write(codec, mono, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
-                           val);
- }
- 
-@@ -4244,7 +4244,7 @@ static struct snd_kcontrol_new alc260_hp
-               .info = snd_ctl_boolean_mono_info,
-               .get = alc260_hp_master_sw_get,
-               .put = alc260_hp_master_sw_put,
--              .private_value = (0x10 << 16) | (0x15 << 8) | 0x11
-+              .private_value = (0x15 << 16) | (0x10 << 8) | 0x11
-       },
-       HDA_CODEC_VOLUME("Front Playback Volume", 0x09, 0x0, HDA_OUTPUT),
-       HDA_CODEC_MUTE("Front Playback Switch", 0x10, 0x0, HDA_OUTPUT),
-@@ -4297,7 +4297,7 @@ static void alc260_hp_3013_automute(stru
-       present = snd_hda_codec_read(codec, 0x15, 0,
-                                    AC_VERB_GET_PIN_SENSE, 0);
-       spec->jack_present = (present & AC_PINSENSE_PRESENCE) != 0;
--      alc260_hp_master_update(codec, 0x10, 0x15, 0x11);
-+      alc260_hp_master_update(codec, 0x15, 0x10, 0x11);
- }
- 
- static void alc260_hp_3013_unsol_event(struct hda_codec *codec,