Linus,
please pull sound fixes for v2.6.37 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
One va_end() fix patch in rare error paths (for -ENOMEM), and a few
quirks and regression fixes. This should be the last pull request for
2.6.37 as I'm going to be on vacation from tomorrow :)
Thanks!
Takashi
===
David Henningsson (1):
ALSA: HDA: Add auto-mute for Thinkpad SL410/SL510
Jesper Juhl (1):
ALSA: pcm: remember to always call va_end() on stuff that we va_start()
Kailang Yang (2):
ALSA: hda - Add fix-up for Sony VAIO with ALC275 codecs
ALSA: hda - Don't apply ALC269-specific initialization to ALC275
Takashi Iwai (3):
ALSA: hda - Fix conflict of d-mic capture volume controls
ALSA: hda - Try to find an empty control index when it's occupied
ALSA: hda - Fix GPIO2-fixup for Sony laptops
---
sound/core/pcm_lib.c | 10 ++++--
sound/pci/hda/hda_codec.c | 57 +++++++++++++++++++++--------------
sound/pci/hda/patch_realtek.c | 64 ++++++++++++++++++++++++---------------
sound/pci/hda/patch_sigmatel.c | 5 +--
4 files changed, 82 insertions(+), 54 deletions(-)
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index b75db8e..11446a1 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -1070,8 +1070,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
struct snd_pcm_hw_rule *new;
unsigned int new_rules = constrs->rules_all + 16;
new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL);
- if (!new)
+ if (!new) {
+ va_end(args);
return -ENOMEM;
+ }
if (constrs->rules) {
memcpy(new, constrs->rules,
constrs->rules_num * sizeof(*c));
@@ -1087,8 +1089,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
c->private = private;
k = 0;
while (1) {
- if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps)))
+ if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps))) ...
