diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:30:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:30:35 -0700 |
| commit | 8eb88c80d444fd249edaa7d895666cde79e7b3b8 (patch) | |
| tree | 8518f579c841abc05075285a1d4683caa6eec9c2 /sound/soc | |
| parent | c53dbf54863e7f3b0b8810dda2bdd0290006bdac (diff) | |
| parent | 219b22b24546dbd512419766eb46f6b729a5453a (diff) | |
| download | kernel_samsung_espresso10-8eb88c80d444fd249edaa7d895666cde79e7b3b8.zip kernel_samsung_espresso10-8eb88c80d444fd249edaa7d895666cde79e7b3b8.tar.gz kernel_samsung_espresso10-8eb88c80d444fd249edaa7d895666cde79e7b3b8.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: Fix debugfs_create_dir's error checking method for sound/soc/
ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
ALSA: kernel docs: fix sound/core/ kernel-doc
ALSA: Handle NULL jacks in snd_jack_report()
ALSA: hda - Fix PCM type of Nvidia HDMI devices
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/at32/playpaq_wm8510.c | 12 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sound/soc/at32/playpaq_wm8510.c b/sound/soc/at32/playpaq_wm8510.c index 98a2d58..b1966e4 100644 --- a/sound/soc/at32/playpaq_wm8510.c +++ b/sound/soc/at32/playpaq_wm8510.c @@ -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 */ diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index efbd0b3..7351db9 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -831,7 +831,7 @@ int snd_soc_dapm_sys_add(struct device *dev) return ret; asoc_debugfs = debugfs_create_dir("asoc", NULL); - if (!IS_ERR(asoc_debugfs)) + if (!IS_ERR(asoc_debugfs) && asoc_debugfs) debugfs_create_u32("dapm_pop_time", 0744, asoc_debugfs, &pop_time); else |