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>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 78ab6965af55ce08e9ce69fdf4778b2a9d383c75..d7be3981f0269d5239562934f4f95b5ddeea5eed 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3487,7 +3487,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
                break;
        case snd_soc_dapm_pinctrl:
                w->pinctrl = devm_pinctrl_get(dapm->dev);
-               if (IS_ERR_OR_NULL(w->pinctrl)) {
+               if (IS_ERR(w->pinctrl)) {
                        ret = PTR_ERR(w->pinctrl);
                        if (ret == -EPROBE_DEFER)
                                return ERR_PTR(ret);