sound fixes for 2.6.37
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(-)
sound/core/pcm_lib.c +7 -3
@@ -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))) { +va_end (args);return -EINVAL ; + } c->deps[k++] = dep;if (dep <0 )break ;
@@ -1097,7 +1101,7 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond, constrs->rules_num++;va_end (args);return 0 ; -} +}EXPORT_SYMBOL (snd_pcm_hw_rule_add);
sound/pci/hda/hda_codec.c +34 -23
93 lines not on this page · raw message
sound/pci/hda/patch_realtek.c +39 -25
97 lines not on this page · raw message
sound/pci/hda/patch_sigmatel.c +2 -3
@@ -3481,6 +3481,8 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec, label =hda_get_input_pin_label (codec, nid,1 );snd_hda_add_imux_item (dimux, label, index, &type_idx); +if (snd_hda_get_bool_hint (codec,"separate_dmux" ) !=1 ) +snd_hda_add_imux_item (imux, label, index, &type_idx); err =create_elem_capture_vol (codec, nid, label, type_idx,HDA_INPUT );
@@ -3492,9 +3494,6 @@ static int stac92xx_auto_create_dmic_input_ctls(struct hda_codec *codec,if (err <0 )return err; } - -if (snd_hda_get_bool_hint (codec,"separate_dmux" ) !=1 ) -snd_hda_add_imux_item (imux, label, index,NULL ); }return 0 ;