diff options
| author | Mark Brown <broonie@kernel.org> | 2015-05-06 06:58:24 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-05-06 06:58:24 -0400 |
| commit | 292d2497cd8f551642a38f7a55b1b7965049c75d (patch) | |
| tree | 1332204457623c47341dffbcd4ff33bf83599d47 /sound/soc/intel | |
| parent | 26f63c692f012ff665a8fd085a36549fe734f59f (diff) | |
| parent | 177e1e1fbc63f6e4ac0fab56dcb61bb8c8597681 (diff) | |
Merge branch 'topic/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/boards/cht_bsw_rt5645.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c index 7d23ead3fd40..8f96c21fef4f 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c | |||
| @@ -214,7 +214,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) | |||
| 214 | return ret; | 214 | return ret; |
| 215 | } | 215 | } |
| 216 | 216 | ||
| 217 | rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack); | 217 | rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, NULL); |
| 218 | 218 | ||
| 219 | return ret; | 219 | return ret; |
| 220 | } | 220 | } |