diff options
author | Mark Brown <broonie@kernel.org> | 2018-12-13 14:36:46 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-12-13 14:36:46 +0000 |
commit | 8fe8915b6c0b5298fa547be21957b3860c39c46e (patch) | |
tree | f16772eef6506fa40fe43f53b416cd4cd4eccf6b /sound/soc/sh/rcar/ssi.c | |
parent | 1b46ed96961db1a826b3e5cadac18c7c4857f054 (diff) | |
parent | a01b8d1d24451bfc00d3a975d107f9b1590bf826 (diff) | |
download | linux-8fe8915b6c0b5298fa547be21957b3860c39c46e.tar.gz linux-8fe8915b6c0b5298fa547be21957b3860c39c46e.tar.bz2 linux-8fe8915b6c0b5298fa547be21957b3860c39c46e.zip |
Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-4.21 intel dep
Diffstat (limited to 'sound/soc/sh/rcar/ssi.c')
-rw-r--r-- | sound/soc/sh/rcar/ssi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 1fdcc7c3fc7e..45ef295743ec 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -286,7 +286,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod, if (rsnd_ssi_is_multi_slave(mod, io)) return 0; - if (ssi->rate) { + if (ssi->usrcnt > 1) { if (ssi->rate != rate) { dev_err(dev, "SSI parent/child should use same rate\n"); return -EINVAL; |