Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / samsung / aries_wm8994.c

diff --git a/sound/soc/samsung/aries_wm8994.c b/sound/soc/samsung/aries_wm8994.c
index bb0cf4244e00726517d2a9e213b81649cf70fa38..e7d52d27132ea1bf160b10f27230a383026845fc 100644 (file)
--- a/sound/soc/samsung/aries_wm8994.c
+++ b/sound/soc/samsung/aries_wm8994.c
@@ -432,7 +432,6 @@ static const struct snd_soc_component_driver aries_component = {
        .idle_bias_on           = 1,
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static struct snd_soc_dai_driver aries_ext_dai[] = {
@@ -628,8 +627,10 @@ static int aries_audio_probe(struct platform_device *pdev)
                return -EINVAL;
 
        codec = of_get_child_by_name(dev->of_node, "codec");
-       if (!codec)
-               return -EINVAL;
+       if (!codec) {
+               ret = -EINVAL;
+               goto out;
+       }
 
        for_each_card_prelinks(card, i, dai_link) {
                dai_link->codecs->of_node = of_parse_phandle(codec,