| From 3c9803270cbf918f849934c731b7ed29b82ba7b9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 28 Aug 2018 14:35:03 +0100 |
| Subject: ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl |
| |
| From: Charles Keepax <ckeepax@opensource.cirrus.com> |
| |
| [ Upstream commit a5cd7e9cf587f51a84b86c828b4e1c7b392f448e ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/soc-dapm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c |
| index 4ce57510b6236..ff31d9f9ecd64 100644 |
| --- a/sound/soc/soc-dapm.c |
| +++ b/sound/soc/soc-dapm.c |
| @@ -3514,7 +3514,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); |
| -- |
| 2.20.1 |
| |