diff options
| author | John Hsu <KCHSU0@nuvoton.com> | 2018-03-02 03:45:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-02 12:29:20 +0100 |
| commit | 3bf045d15f52529e8abe26543dbe22af44efb41a (patch) | |
| tree | f9c8b1ac33c908874a564128d7b9b8db3e77fc74 /sound | |
| parent | Merge branch 'topic/component-platform' of https://git.kernel.org/pub/scm/lin... (diff) | |
| download | linux-3bf045d15f52529e8abe26543dbe22af44efb41a.tar.xz linux-3bf045d15f52529e8abe26543dbe22af44efb41a.zip | |
ASoC: Intel: fix argument error in nau8824 machine
Fix the error: passing argument 1 of 'nau8824_enable_jack_detect'
from incompatible pointer type
nau8824_enable_jack_detect(codec, jack);
^~~~~
Which expects 'struct snd_soc_component *' but argument is of type
'struct snd_soc_codec *'
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: John Hsu <KCHSU0@nuvoton.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/boards/cht_bsw_nau8824.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index 08d0b8128fab..680f2b3a24f9 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -103,8 +103,8 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) { struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); struct snd_soc_jack *jack = &ctx->jack; - struct snd_soc_codec *codec = runtime->codec; struct snd_soc_dai *codec_dai = runtime->codec_dai; + struct snd_soc_component *component = codec_dai->component; int ret, jack_type; /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ @@ -134,7 +134,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - nau8824_enable_jack_detect(codec, jack); + nau8824_enable_jack_detect(component, jack); return ret; } |