Merge tag 'ovl-update-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

[linux-2.6-microblaze.git] / sound / soc / samsung / tm2_wm5110.c

diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c
index 9300fef..84c2c63 100644 (file)
--- a/sound/soc/samsung/tm2_wm5110.c
+++ b/sound/soc/samsung/tm2_wm5110.c
@@ -501,7 +501,6 @@ static int tm2_probe(struct platform_device *pdev)
        struct device *dev = &pdev->dev;
        struct snd_soc_card *card = &tm2_card;
        struct tm2_machine_priv *priv;
-       struct of_phandle_args args;
        struct snd_soc_dai_link *dai_link;
        int num_codecs, ret, i;
 
@@ -553,7 +552,7 @@ static int tm2_probe(struct platform_device *pdev)
 
                ret = of_parse_phandle_with_args(dev->of_node, "i2s-controller",
                                                 cells_name, i, &args);
-               if (!args.np) {
+               if (ret) {
                        dev_err(dev, "i2s-controller property parse error: %d\n", i);
                        ret = -EINVAL;
                        goto dai_node_put;
@@ -585,6 +584,8 @@ static int tm2_probe(struct platform_device *pdev)
        }
 
        if (num_codecs > 1) {
+               struct of_phandle_args args;
+
                /* HDMI DAI link (I2S1) */
                i = card->num_links - 1;