diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-02 17:01:50 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-02 17:01:50 +0400 |
| commit | 729b47a007345d0af214f7f64a784c6bb3ad4832 (patch) | |
| tree | d7e7a2f28dd07f7106c6eec1f44ca637cdf22614 /sound/soc/soc-core.c | |
| parent | 30010a279657144f7de0a94f89896e4e2d3bbb75 (diff) | |
| parent | e41975edc73d2c16d0784e5fa87a6162e2fcab80 (diff) | |
| download | linux-729b47a007345d0af214f7f64a784c6bb3ad4832.tar.xz | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a66783e13a9c..be88df5eeaf7 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4617,10 +4617,14 @@ int snd_soc_of_get_dai_name(struct device_node *of_node, if (id < 0 || id >= pos->num_dai) { ret = -EINVAL; - } else { - *dai_name = pos->dai_drv[id].name; - ret = 0; + break; } + + ret = 0; + + *dai_name = pos->dai_drv[id].name; + if (!*dai_name) + *dai_name = pos->name; } break; |