From 62659b310e43ece606749f352d0016f623e79651 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 23 Nov 2011 12:42:06 -0700 Subject: [PATCH] --- yaml --- r: 283767 b: refs/heads/master c: 504855d171f4183ac231a5ecdf0273ac249cda2b h: refs/heads/master i: 283765: 493a7430e6032d2ebaffcd3642a5c234798d42de 283763: c3f0caa7b5dbe38df1b51fc38513c1845ab3ee84 283759: 99cb88529f8f20030fd6dcafeadc83a2410a3c7a v: v3 --- [refs] | 2 +- trunk/sound/soc/tegra/trimslice.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index afc437e5957a..62546a43e426 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e5fdba9c9d4e2fdb19bf19633cb7b9bb72dccb1 +refs/heads/master: 504855d171f4183ac231a5ecdf0273ac249cda2b diff --git a/trunk/sound/soc/tegra/trimslice.c b/trunk/sound/soc/tegra/trimslice.c index d564b40756a9..043eb7c7eb73 100644 --- a/trunk/sound/soc/tegra/trimslice.c +++ b/trunk/sound/soc/tegra/trimslice.c @@ -119,7 +119,6 @@ static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; struct snd_soc_card *card = codec->card; - struct snd_soc_dapm_context *dapm = &codec->dapm; int ret; ret = tegra_das_connect_dap_to_dac(TEGRA_DAS_DAP_ID_1, @@ -135,10 +134,6 @@ static int trimslice_asoc_init(struct snd_soc_pcm_runtime *rtd) return ret; } - snd_soc_dapm_nc_pin(dapm, "LHPOUT"); - snd_soc_dapm_nc_pin(dapm, "RHPOUT"); - snd_soc_dapm_nc_pin(dapm, "MICIN"); - return 0; } @@ -162,6 +157,7 @@ static struct snd_soc_card snd_soc_trimslice = { .num_dapm_widgets = ARRAY_SIZE(trimslice_dapm_widgets), .dapm_routes = trimslice_audio_map, .num_dapm_routes = ARRAY_SIZE(trimslice_audio_map), + .fully_routed = true, }; static __devinit int tegra_snd_trimslice_probe(struct platform_device *pdev)