| From 7ac45d1635a4cd2e99a4b11903d4a2815ca1b27b Mon Sep 17 00:00:00 2001 |
| From: Julian Scheel <julian@jusst.de> |
| Date: Wed, 24 May 2017 12:28:23 +0200 |
| Subject: ASoC: simple-card: Fix misleading error message |
| |
| From: Julian Scheel <julian@jusst.de> |
| |
| commit 7ac45d1635a4cd2e99a4b11903d4a2815ca1b27b upstream. |
| |
| In case cpu could not be found the error message would always refer to |
| /codec/ not being found in DT. Fix this by catching the cpu node not found |
| case explicitly. |
| |
| Signed-off-by: Julian Scheel <julian@jusst.de> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: thongsyho <thong.ho.px@rvc.renesas.com> |
| Signed-off-by: Nhan Nguyen <nhan.nguyen.yb@renesas.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| sound/soc/generic/simple-card.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| --- a/sound/soc/generic/simple-card.c |
| +++ b/sound/soc/generic/simple-card.c |
| @@ -343,13 +343,19 @@ static int asoc_simple_card_dai_link_of( |
| snprintf(prop, sizeof(prop), "%scpu", prefix); |
| cpu = of_get_child_by_name(node, prop); |
| |
| + if (!cpu) { |
| + ret = -EINVAL; |
| + dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop); |
| + goto dai_link_of_err; |
| + } |
| + |
| snprintf(prop, sizeof(prop), "%splat", prefix); |
| plat = of_get_child_by_name(node, prop); |
| |
| snprintf(prop, sizeof(prop), "%scodec", prefix); |
| codec = of_get_child_by_name(node, prop); |
| |
| - if (!cpu || !codec) { |
| + if (!codec) { |
| ret = -EINVAL; |
| dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop); |
| goto dai_link_of_err; |
