diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:42 +0100 |
| commit | 8e8fbd8f5838737471e4ad55a37a8b0df02a93c0 (patch) | |
| tree | 780b5eb13992701d77b0c848b6c8f69905135d73 /sound/soc/intel/haswell.c | |
| parent | 6bf88ab2ecf2f3d25ee25fb4946e4487c4ffd612 (diff) | |
| parent | d77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next
Diffstat (limited to 'sound/soc/intel/haswell.c')
| -rw-r--r-- | sound/soc/intel/haswell.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c index 54345a2a738..94c2c33ffe4 100644 --- a/sound/soc/intel/haswell.c +++ b/sound/soc/intel/haswell.c @@ -89,8 +89,6 @@ static struct snd_soc_ops haswell_rt5640_ops = { static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev); struct sst_hsw *haswell = pdata->dsp; int ret; @@ -104,10 +102,6 @@ static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd) return ret; } - /* always connected */ - snd_soc_dapm_enable_pin(dapm, "Headphones"); - snd_soc_dapm_enable_pin(dapm, "Mic"); - return 0; } |