The dai driver's name is allowed to be NULL. So add a sanity check for
that.

Signed-off-by: Jeffy Chen <jeffy.c...@rock-chips.com>
Reported-by: Donglin Peng <dolinux.p...@gmail.com>
---

Changes in v3:
Fix typo

Changes in v2:
Keep the oringinal check style.

 sound/soc/soc-core.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fc1bb2da3e2e..8827c2225ba3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1029,7 +1029,8 @@ struct snd_soc_dai *snd_soc_find_dai(
                        continue;
                list_for_each_entry(dai, &component->dai_list, list) {
                        if (dlc->dai_name && strcmp(dai->name, dlc->dai_name)
-                           && strcmp(dai->driver->name, dlc->dai_name))
+                           && (!dai->driver->name
+                               || strcmp(dai->driver->name, dlc->dai_name)))
                                continue;
 
                        return dai;
-- 
2.11.0


Reply via email to