Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

2 files changed, 6 insertions, 3 deletions

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 938baff86ef2..e11ce5036bcf 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -479,10 +479,10 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
         }
 
         if (req_rate[0] % 48000 == 0)
-                adg->flags = AUDIO_OUT_48;
+                adg->flags |= AUDIO_OUT_48;
 
         if (of_get_property(np, "clkout-lr-asynchronous", NULL))
-                adg->flags = LRCLK_ASYNC;
+                adg->flags |= LRCLK_ASYNC;
 
         /*
          * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index fffc07e72627..03c2a1f02643 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -1112,6 +1112,9 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
 
         i = 0;
         for_each_child_of_node(node, np) {
+                if (!of_device_is_available(np))
+                        goto skip;
+
                 ssi = rsnd_ssi_get(priv, i);
 
                 snprintf(name, RSND_SSI_NAME_SIZE, "%s.%d",
@@ -1148,7 +1151,7 @@ int rsnd_ssi_probe(struct rsnd_priv *priv)
                         of_node_put(np);
                         goto rsnd_ssi_probe_done;
                 }
-
+skip:
                 i++;
         }