diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-09-26 21:37:40 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2018-09-27 23:22:54 +0100 |
| commit | 18380dcc52cc8965e5144ce33fdfad7e168679a5 (patch) | |
| tree | 4c040efa11b4e0514c2b291048b1eaed2f6a948d | |
| parent | ASoC: atmel: add SND_SOC_I2C_AND_SPI dependency (diff) | |
| download | linux-dev-18380dcc52cc8965e5144ce33fdfad7e168679a5.tar.xz linux-dev-18380dcc52cc8965e5144ce33fdfad7e168679a5.zip | |
ASoC: wm9712: fix unused variable warning
The 'ret' variable is now only used in an #ifdef, and causes a
warning if it is declared outside of that block:
sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe':
sound/soc/codecs/wm9712.c:641:6: error: unused variable 'ret' [-Werror=unused-variable]
Fixes: 2ed1a8e0ce8d ("ASoC: wm9712: add ac97 new bus support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/wm9712.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c index ade34c26ad2f..e873baa9e778 100644 --- a/sound/soc/codecs/wm9712.c +++ b/sound/soc/codecs/wm9712.c @@ -638,13 +638,14 @@ static int wm9712_soc_probe(struct snd_soc_component *component) { struct wm9712_priv *wm9712 = snd_soc_component_get_drvdata(component); struct regmap *regmap; - int ret; if (wm9712->mfd_pdata) { wm9712->ac97 = wm9712->mfd_pdata->ac97; regmap = wm9712->mfd_pdata->regmap; } else { #ifdef CONFIG_SND_SOC_AC97_BUS + int ret; + wm9712->ac97 = snd_soc_new_ac97_component(component, WM9712_VENDOR_ID, WM9712_VENDOR_ID_MASK); if (IS_ERR(wm9712->ac97)) { |