diff options
| author | John Hsu <KCHSU0@nuvoton.com> | 2016-08-23 16:02:49 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-23 11:40:19 +0100 |
| commit | 78822e36dca8fe8bc83e7847508891b59f3f8603 (patch) | |
| tree | b3f9e1eb5fd54dd4fca6fcb4cb57ed32aa1c640f /sound/soc/codecs | |
| parent | b6970b48e384a602bdb9d6246cded83e150d4660 (diff) | |
| download | blackbird-op-linux-78822e36dca8fe8bc83e7847508891b59f3f8603.tar.gz blackbird-op-linux-78822e36dca8fe8bc83e7847508891b59f3f8603.zip | |
ASoC: nau8810: fix compile warning in loopback switch control
Thank Stephen Rothwell for the message.
The patch is to fix the following compile error.
sound/soc/codecs/nau8810.c:441:3: error: initialization from incompatible
pointer type [-Werror=incompatible-pointer-types]
SND_SOC_DAPM_SWITCH("Digital Loopback", SND_SOC_NOPM, 0, 0,
&nau8810_loopback),
^
sound/soc/codecs/nau8810.c:441:3: note: (near initialization for
'nau8810_dapm_widgets[11].kcontrol_news')
Signed-off-by: John Hsu <KCHSU0@nuvoton.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/nau8810.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/nau8810.c b/sound/soc/codecs/nau8810.c index 7617ddad5601..f9bcdc33df84 100644 --- a/sound/soc/codecs/nau8810.c +++ b/sound/soc/codecs/nau8810.c @@ -391,10 +391,9 @@ static const struct snd_kcontrol_new nau8810_mic_boost_controls = NAU8810_PMICBSTGAIN_SFT, 0x7, 0); /* Loopback Switch */ -static const struct snd_kcontrol_new nau8810_loopback[] = { +static const struct snd_kcontrol_new nau8810_loopback = SOC_DAPM_SINGLE("Switch", NAU8810_REG_COMP, - NAU8810_ADDAP_SFT, 1, 0), -}; + NAU8810_ADDAP_SFT, 1, 0); static int check_mclk_select_pll(struct snd_soc_dapm_widget *source, struct snd_soc_dapm_widget *sink) |
