|
@@ -3487,7 +3487,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,
|
|
break;
|
|
break;
|
|
case snd_soc_dapm_pinctrl:
|
|
case snd_soc_dapm_pinctrl:
|
|
w->pinctrl = devm_pinctrl_get(dapm->dev);
|
|
w->pinctrl = devm_pinctrl_get(dapm->dev);
|
|
- if (IS_ERR_OR_NULL(w->pinctrl)) {
|
|
|
|
|
|
+ if (IS_ERR(w->pinctrl)) {
|
|
ret = PTR_ERR(w->pinctrl);
|
|
ret = PTR_ERR(w->pinctrl);
|
|
if (ret == -EPROBE_DEFER)
|
|
if (ret == -EPROBE_DEFER)
|
|
return ERR_PTR(ret);
|
|
return ERR_PTR(ret);
|