diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-05-08 10:29:31 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-05-08 10:29:31 +0200 |
commit | 5095c418b939186c2eac4fabf14d0036656a8ab1 (patch) | |
tree | bacd65f786f8decc42525fe411d81c687ff38f52 /sound/soc/codecs/da7219.c | |
parent | ALSA: hdea/realtek - Headset fixup for System76 Gazelle (gaze14) (diff) | |
parent | ASoC: SOF: core: fix undefined nocodec reference (diff) | |
download | linux-5095c418b939186c2eac4fabf14d0036656a8ab1.tar.xz linux-5095c418b939186c2eac4fabf14d0036656a8ab1.zip |
Merge tag 'asoc-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.2
A bunch of driver specific fixes that came in since the initial pull
request for v5.2, mainly warning fixes for the newly added Sound Open
Firmware code which people appeared to only start looking at after I'd
sent the pull request.
Diffstat (limited to 'sound/soc/codecs/da7219.c')
-rw-r--r-- | sound/soc/codecs/da7219.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index cf2948c00262..7d9d1f84eed8 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -2363,7 +2363,9 @@ err_disable_reg: static void da7219_remove(struct snd_soc_component *component) { struct da7219_priv *da7219 = snd_soc_component_get_drvdata(component); +#ifdef CONFIG_COMMON_CLK int i; +#endif da7219_aad_exit(component); |