From a00908e362d8adde21a86db9e1dd0ef638d9f82f Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 23 Nov 2011 21:33:07 +0000 Subject: [PATCH] --- yaml --- r: 283768 b: refs/heads/master c: 39afd66cead742e99c051d6f3b07f89d09eebbbb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/speyside.c | 3 +-- trunk/sound/soc/samsung/speyside_wm8962.c | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 62546a43e426..14f5345f5ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 504855d171f4183ac231a5ecdf0273ac249cda2b +refs/heads/master: 39afd66cead742e99c051d6f3b07f89d09eebbbb diff --git a/trunk/sound/soc/samsung/speyside.c b/trunk/sound/soc/samsung/speyside.c index 85bf541a771d..efa5187f6197 100644 --- a/trunk/sound/soc/samsung/speyside.c +++ b/trunk/sound/soc/samsung/speyside.c @@ -222,8 +222,6 @@ static struct snd_soc_dai_link speyside_dai[] = { static int speyside_wm9081_init(struct snd_soc_dapm_context *dapm) { - snd_soc_dapm_nc_pin(dapm, "LINEOUT"); - /* At any time the WM9081 is active it will have this clock */ return snd_soc_codec_set_sysclk(dapm->codec, WM9081_SYSCLK_MCLK, 0, 48000 * 256, 0); @@ -308,6 +306,7 @@ static struct snd_soc_card speyside = { .num_dapm_widgets = ARRAY_SIZE(widgets), .dapm_routes = audio_paths, .num_dapm_routes = ARRAY_SIZE(audio_paths), + .fully_routed = true, .late_probe = speyside_late_probe, }; diff --git a/trunk/sound/soc/samsung/speyside_wm8962.c b/trunk/sound/soc/samsung/speyside_wm8962.c index e3e27166cc50..a681c8d74118 100644 --- a/trunk/sound/soc/samsung/speyside_wm8962.c +++ b/trunk/sound/soc/samsung/speyside_wm8962.c @@ -208,6 +208,7 @@ static struct snd_soc_card speyside_wm8962 = { .num_dapm_widgets = ARRAY_SIZE(widgets), .dapm_routes = audio_paths, .num_dapm_routes = ARRAY_SIZE(audio_paths), + .fully_routed = true, .late_probe = speyside_wm8962_late_probe, };