This is a note to let you know that I've just added the patch titled
ALSA: hda - Add missing initial vmaster hook at build_controls callback
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-hda-add-missing-initial-vmaster-hook-at-build_controls-callback.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b63eae0a6c84839275a4638a7baa391be965cd0e Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Fri, 25 Oct 2013 23:43:10 +0200
Subject: ALSA: hda - Add missing initial vmaster hook at build_controls callback
From: Takashi Iwai <tiwai@xxxxxxx>
commit b63eae0a6c84839275a4638a7baa391be965cd0e upstream.
The generic parser has a support of vmaster hook, but this is
initialized only in the init callback with the check of the presence
of the corresponding kctl. However, since kctl is NULL at the very
first init callback that is called before build_controls callback, the
vmaster hook sync is skipped there. Eventually this leads to the
uninitialized state depending on the hook implementation.
This patch adds a simple workaround, just calling the sync function
explicitly at build_controls callback.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/hda_generic.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -4383,9 +4383,11 @@ int snd_hda_gen_build_controls(struct hd
true, &spec->vmaster_mute.sw_kctl);
if (err < 0)
return err;
- if (spec->vmaster_mute.hook)
+ if (spec->vmaster_mute.hook) {
snd_hda_add_vmaster_hook(codec, &spec->vmaster_mute,
spec->vmaster_mute_enum);
+ snd_hda_sync_vmaster_hook(&spec->vmaster_mute);
+ }
}
free_kctls(spec); /* no longer needed */
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.10/alsa-hda-fix-unbalanced-runtime-pm-refcount-after-s3-s4.patch
queue-3.10/asoc-wm_hubs-add-missing-break-in-hp_supply_event.patch
queue-3.10/alsa-fix-oops-in-snd_pcm_info-caused-by-asoc-dpcm.patch
queue-3.10/alsa-hda-add-a-fixup-for-asus-n76vz.patch
queue-3.10/asoc-dapm-fix-source-list-debugfs-outputs.patch
queue-3.10/alsa-hda-add-missing-initial-vmaster-hook-at-build_controls-callback.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html