sound fixes for 3.1
Subsystems (3)
Linus,
please pull sound fixes for v3.1 from:
git://github.com/tiwai/sound.git for-linus
The topmost commit is 0fac25908f8e26a27d869f0aa4fad04c3db60dc7.
Hopefully this will be the last pull request for 3.1.
Only small regression fixes, most of which are to stable kernel, too.
Thanks!
Takashi
===
David Henningsson (1):
ALSA: HDA: No power nids on 92HD93
Jarkko Nikula (1):
ASoC: omap-mcbsp: Do not attempt to change DAI sysclk if stream is active
Lars-Peter Clausen (1):
ASoC: ssm2602: Re-enable oscillator after suspend
Takashi Iwai (2):
ALSA: hda/realtek - Avoid bogus HP-pin assignment
ALSA: hda/realtek - Don't detect LO jack when identical with HP
Thomas Pfaff (1):
ALSA: usb-audio: Check for possible chip NULL pointer before clearing probing flag
--- sound/pci/hda/patch_realtek.c | 8 +++++++- sound/pci/hda/patch_sigmatel.c | 1 + sound/soc/codecs/ssm2602.c | 3 ++- sound/soc/omap/omap-mcbsp.c | 6 ++++++ sound/usb/card.c | 8 +++++--- 5 files changed, 21 insertions(+), 5 deletions(-)
sound/pci/hda/patch_realtek.c +7 -1
@@ -578,6 +578,10 @@ static void alc_line_automute(struct hda_codec *codec) {struct alc_spec *spec = codec->spec; +/* check LO jack only when it's different from HP */ +if (spec->autocfg.line_out_pins[0 ] == spec->autocfg.hp_pins[0 ]) +return ; + spec->line_jack_present =detect_jacks (codec,ARRAY_SIZE (spec->autocfg.line_out_pins), spec->autocfg.line_out_pins);
@@ -1321,7 +1325,9 @@ do_sku:* 15 : 1 --> enable the function "Mute internal speaker * when the external headphone out jack is plugged" */ -if (!spec->autocfg.hp_pins[0 ]) { +if (!spec->autocfg.hp_pins[0 ] && + !(spec->autocfg.line_out_pins[0 ] && + spec->autocfg.line_out_type ==AUTO_PIN_HP_OUT )) {hda_nid_t nid; tmp = (ass >>11 ) &0x3 ;/* HP to chassis */ if (tmp ==0 )
sound/pci/hda/patch_sigmatel.c +1 -0
@@ -5630,6 +5630,7 @@ again:switch (codec->vendor_id) {case 0x111d76d1 :case 0x111d76d9 : +case 0x111d76df :case 0x111d76e5 :case 0x111d7666 :case 0x111d7667 :
sound/soc/codecs/ssm2602.c +2 -1
@@ -431,7 +431,8 @@ static int ssm2602_set_dai_fmt(struct snd_soc_dai *codec_dai,static int ssm2602_set_bias_level (struct snd_soc_codec *codec,enum snd_soc_bias_level level) { -u16 reg =snd_soc_read (codec,SSM2602_PWR ) &0xff7f ; +u16 reg =snd_soc_read (codec,SSM2602_PWR ); + reg &= ~(PWR_POWER_OFF |PWR_OSC_PDN );switch (level) {case SND_SOC_BIAS_ON :
sound/soc/omap/omap-mcbsp.c +6 -0
@@ -516,6 +516,12 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,struct omap_mcbsp_reg_cfg *regs = &mcbsp_data->regs;int err =0 ; +if (mcbsp_data->active) +if (freq == mcbsp_data->in_freq) +return 0 ; +else +return -EBUSY ; +/* The McBSP signal muxing functions are only available on McBSP1 */ if (clk_id == OMAP_MCBSP_CLKR_SRC_CLKR || clk_id == OMAP_MCBSP_CLKR_SRC_CLKX ||
sound/usb/card.c +5 -3
@@ -530,9 +530,11 @@ snd_usb_audio_probe(struct usb_device *dev,return chip; __error: -if (chip && !chip->num_interfaces) -snd_card_free (chip->card); - chip->probing =0 ; +if (chip) { +if (!chip->num_interfaces) +snd_card_free (chip->card); + chip->probing =0 ; + }mutex_unlock (®ister_mutex); __err_val:return NULL ;