diff options
author | Mark Brown <broonie@kernel.org> | 2017-10-26 09:45:37 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-10-26 09:45:37 +0200 |
commit | 1ef6f346c62f386f28b0012d6379e2822a3842d3 (patch) | |
tree | 72ccea913e509ac18813ec3dc96e76cffb263f54 /sound/soc | |
parent | eefb175fc227492bfcfadce5409f48911923fa02 (diff) | |
parent | 9e9e95df06433b4f89cfeef0003af091ee0ebc86 (diff) | |
download | linux-1ef6f346c62f386f28b0012d6379e2822a3842d3.tar.bz2 |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/sh/rcar/adg.c | 4 | ||||
-rw-r--r-- | sound/soc/sh/rcar/ssi.c | 5 |
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++; } |