]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Tue, 28 Aug 2018 13:35:03 +0000 (14:35 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 28 Aug 2018 18:35:24 +0000 (19:35 +0100)
commit3783997e771d69fde1134c5404ccdcb3ba603920
tree888a8282a176127d07647d1d6a013e7fb4fb8263
parenta9b9b9331d93b125a38bb4e8a902efef626605b8
ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl

devm_pinctrl_get will only return NULL in the case that pinctrl
is not built into the kernel and all the pinctrl functions used
by the DAPM core are appropriately stubbed for that case. There
is no need to error out of snd_soc_dapm_new_control_unlocked
if pinctrl isn't built into the kernel, so change the
IS_ERR_OR_NULL to just an IS_ERR.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-dapm.c