diff options
| author | Mark Brown | 2015-06-05 19:54:46 +0200 |
|---|---|---|
| committer | Mark Brown | 2015-06-05 19:54:46 +0200 |
| commit | f3b368d3b9a22bb1ddc80808a64ecb7559791e87 (patch) | |
| tree | ffe7f0c236b24d441fd779a839f7a1224e6be8e6 /sound/soc/intel | |
| parent | Merge remote-tracking branch 'asoc/topic/dma' into asoc-next (diff) | |
| parent | ASoC: rt5645: fix kernel hang when call rt5645_set_jack_detect() (diff) | |
| download | kernel-qcow2-linux-f3b368d3b9a22bb1ddc80808a64ecb7559791e87.tar.gz kernel-qcow2-linux-f3b368d3b9a22bb1ddc80808a64ecb7559791e87.tar.xz kernel-qcow2-linux-f3b368d3b9a22bb1ddc80808a64ecb7559791e87.zip | |
Merge remote-tracking branch 'asoc/topic/rt5645' into asoc-next
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 20a28b22e30f..26e01f36b704 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -185,7 +185,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) return ret; } - rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack); + rt5645_set_jack_detect(codec, &ctx->hp_jack, &ctx->mic_jack, NULL); return ret; } |