From cc74ee77ff7010d025685110afc35621e6c125d9 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 25 Nov 2010 13:43:49 +0800 Subject: [PATCH] --- yaml --- r: 230286 b: refs/heads/master c: 74bd21e9b301445b57bdcccdd7b5063ad3fbad0f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/samsung/smartq_wm8987.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5a47d7d0ec87..0f0e68fec5a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ce28bfcf25527b228b8dff1d38480e3643a94d1 +refs/heads/master: 74bd21e9b301445b57bdcccdd7b5063ad3fbad0f diff --git a/trunk/sound/soc/samsung/smartq_wm8987.c b/trunk/sound/soc/samsung/smartq_wm8987.c index d6a340b8c3f7..0a46fa8730d1 100644 --- a/trunk/sound/soc/samsung/smartq_wm8987.c +++ b/trunk/sound/soc/samsung/smartq_wm8987.c @@ -39,8 +39,8 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; - struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + struct snd_soc_dai *cpu_dai = rtd->cpu_dai; unsigned int clk = 0; int ret; @@ -153,8 +153,9 @@ static const struct snd_soc_dapm_route audio_map[] = { {"LINPUT2", NULL, "Mic Bias"}, }; -static int smartq_wm8987_init(struct snd_soc_codec *codec) +static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd) { + struct snd_soc_codec *codec = rtd->codec; struct snd_soc_dapm_context *dapm = &codec->dapm; int err = 0; @@ -188,7 +189,7 @@ static int smartq_wm8987_init(struct snd_soc_codec *codec) return err; /* Headphone jack detection */ - err = snd_soc_jack_new(&snd_soc_smartq, "Headphone Jack", + err = snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE, &smartq_jack); if (err) return err;