]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: wm97xx: fix uninitialized regmap pointer problem
authorArnd Bergmann <arnd@arndb.de>
Fri, 2 Nov 2018 15:18:21 +0000 (16:18 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 5 Nov 2018 10:37:39 +0000 (10:37 +0000)
commit1d6937d76310991373c9eb3721228fca6d23f3da
tree963590a4f744316fc785de067d1bc5ad19e32c62
parent22e9ddc0e008d4b745c032d176c0ae1e97fe0ecc
ASoC: wm97xx: fix uninitialized regmap pointer problem

gcc notices that without either the ac97 bus or the pdata, we never
initialize the regmap pointer, which leads to an uninitialized variable
access:

sound/soc/codecs/wm9712.c: In function 'wm9712_soc_probe':
sound/soc/codecs/wm9712.c:666:2: error: 'regmap' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Since that configuration is invalid, it's better to return an error
here. I tried to avoid adding complexity to the conditions, and turned
the #ifdef into a regular if(IS_ENABLED()) check for readability.
This in turn requires moving some header file declarations out of
an #ifdef.

The same code is used in three drivers, all of which I'm changing
the same way.

Fixes: 56d25bb8a345 ("ASoC: wm9712: add ac97 new bus support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
include/sound/soc.h
sound/soc/codecs/wm9705.c
sound/soc/codecs/wm9712.c
sound/soc/codecs/wm9713.c