From 3dcba280f739772a4156fbcdae39229d6bb5e02b Mon Sep 17 00:00:00 2001 From: Nicolin Chen Date: Mon, 21 Apr 2014 19:14:46 +0800 Subject: ASoC: core: Don't break component searching if both id and num_dai are 0 The commit e41975ed (ASoC: core: Fix the DAI name getting) added a break within the "if (id < 0 || id >= pos->num_dai)" while the original design of the search didn't break the loop if that condition contented but only mark the ret error and let it go on to search the next component. In a case like dmaengine which's not a dai but as a component sharing an identical name with a dai, both the id and pos->num_dai here could be 0. If we break the search, we may never find the dai we want as it might be placed behind its dmaengine in the component list. So this patch fixes the issue above by following the original design to let the search carry on. Signed-off-by: Nicolin Chen Signed-off-by: Mark Brown --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sound') diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 7f8efea5c5b1..799cbe81fe39 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4521,7 +4521,7 @@ int snd_soc_of_get_dai_name(struct device_node *of_node, if (id < 0 || id >= pos->num_dai) { ret = -EINVAL; - break; + continue; } ret = 0; -- cgit v1.2.3