ALSA updates
Linus,
please pull another ALSA updates for 2.6.28 from:
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus
for the following (mostly) trivial fixes.
Thanks!
Takashi
==
Mark Brown (2):
ALSA: Handle NULL jacks in snd_jack_report()
ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
Randy Dunlap (1):
ALSA: kernel docs: fix sound/core/ kernel-doc
Takashi Iwai (1):
ALSA: hda - Fix PCM type of Nvidia HDMI devices
sound/core/jack.c | 3 ++ sound/core/pcm_lib.c | 48 +++++++++++++++++++------------------- sound/core/pcm_native.c | 24 ++++++------------- sound/pci/hda/patch_nvhdmi.c | 1 + sound/soc/at32/playpaq_wm8510.c | 12 ++------- 5 files changed, 39 insertions(+), 49 deletions(-)
sound/core/jack.c +3 -0
@@ -147,6 +147,9 @@ EXPORT_SYMBOL(snd_jack_set_parent);*/ void snd_jack_report (struct snd_jack *jack,int status) { +if (!jack) +return ; +if (jack->type &SND_JACK_HEADPHONE )input_report_switch (jack->input_dev,SW_HEADPHONE_INSERT , status &SND_JACK_HEADPHONE );
sound/core/pcm_lib.c +24 -24
154 lines not on this page · raw message
sound/core/pcm_native.c +8 -16
@@ -875,10 +875,8 @@ static struct action_ops snd_pcm_action_start = { };/** -* snd_pcm_start +* snd_pcm_start - start all linked streams * @substream: the PCM substream instance -* -* Start all linked streams. */ int snd_pcm_start (struct snd_pcm_substream *substream) {
@@ -926,12 +924,11 @@ static struct action_ops snd_pcm_action_stop = { };/** -* snd_pcm_stop +* snd_pcm_stop - try to stop all running streams in the substream group * @substream: the PCM substream instance * @state: PCM state after stopping the stream * -* Try to stop all running streams in the substream group. -* The state of each stream is changed to the given value after that unconditionally. +* The state of each stream is then changed to the given state unconditionally. */ int snd_pcm_stop (struct snd_pcm_substream *substream,int state) {
@@ -941,11 +938,10 @@ int snd_pcm_stop(struct snd_pcm_substream *substream, int state)EXPORT_SYMBOL (snd_pcm_stop);/** -* snd_pcm_drain_done +* snd_pcm_drain_done - stop the DMA only when the given stream is playback * @substream: the PCM substream * -* Stop the DMA only when the given stream is playback. -* The state is changed to SETUP. +* After stopping, the state is changed to SETUP. * Unlike snd_pcm_stop(), this affects only the given stream. */ int snd_pcm_drain_done (struct snd_pcm_substream *substream)
@@ -1065,10 +1061,9 @@ static struct action_ops snd_pcm_action_suspend = { };/** -* snd_pcm_suspend +* snd_pcm_suspend - trigger SUSPEND to all linked streams * @substream: the PCM substream * -* Trigger SUSPEND to all linked streams. * After this call, all streams are changed to SUSPENDED state. */ int snd_pcm_suspend (struct snd_pcm_substream *substream)
@@ -1088,10 +1083,9 @@ int snd_pcm_suspend(struct snd_pcm_substream *substream)EXPORT_SYMBOL (snd_pcm_suspend);/** -* snd_pcm_suspend_all +* snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm * @pcm: the PCM instance * -* Trigger SUSPEND to all substreams in the given pcm. * After this call, all streams are changed to SUSPENDED state. */ int snd_pcm_suspend_all (struct snd_pcm *pcm)
@@ -1313,11 +1307,9 @@ static struct action_ops snd_pcm_action_prepare = { };/** -* snd_pcm_prepare +* snd_pcm_prepare - prepare the PCM substream to be triggerable * @substream: the PCM substream instance * @file: file to refer f_flags -* -* Prepare the PCM substream to be triggerable. */ static int snd_pcm_prepare (struct snd_pcm_substream *substream,struct file *file)
sound/pci/hda/patch_nvhdmi.c +1 -0
@@ -116,6 +116,7 @@ static int nvhdmi_build_pcms(struct hda_codec *codec) codec->pcm_info = info; info->name ="NVIDIA HDMI" ; + info->pcm_type =HDA_PCM_TYPE_HDMI ; info->stream[SNDRV_PCM_STREAM_PLAYBACK ] = nvhdmi_pcm_digital_playback;return 0 ;
sound/soc/at32/playpaq_wm8510.c +3 -9
@@ -304,7 +304,7 @@ static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = { -static const char *intercon[][3 ] = { +static const struct snd_soc_dapm_route intercon[] = {/* speaker connected to SPKOUT */ {"Ext Spk" ,NULL ,"SPKOUTP" }, {"Ext Spk" ,NULL ,"SPKOUTN" },
@@ -312,9 +312,6 @@ static const char *intercon[][3] = { {"Mic Bias", NULL, "Int Mic"}, {"MICN", NULL, "Mic Bias"}, {"MICP", NULL, "Mic Bias"}, - -/* Terminator */ - {NULL, NULL, NULL}, };
@@ -334,11 +331,8 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec)/* * Setup audio path interconnects */ -for (i =0 ; intercon[i][0 ] !=NULL ; i++) { -snd_soc_dapm_connect_input (codec, - intercon[i][0 ], - intercon[i][1 ], intercon[i][2 ]); - } +snd_soc_dapm_add_routes (codec, intercon,ARRAY_SIZE (intercon)); +/* always connected pins */