diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-13 12:45:08 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-13 12:45:08 +0100 |
| commit | 3636887ac64b5f1ed3e5aa19ab790de115601508 (patch) | |
| tree | 41007c9df6fa2afb55727424ceecf47a2eebd2f7 /sound/soc/sh | |
| parent | ASoC: samsung: i2s: Restore support for the secondary PCM (diff) | |
| parent | ASoC: samsung: i2s: Fix prescaler setting for the secondary DAI (diff) | |
| download | linux-3636887ac64b5f1ed3e5aa19ab790de115601508.tar.xz linux-3636887ac64b5f1ed3e5aa19ab790de115601508.zip | |
Merge branch 'for-5.0' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.1
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/rcar/ssi.c | 2 | ||||
| -rw-r--r-- | sound/soc/sh/rcar/ssiu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 45ef295743ec..f5afab631abb 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->usrcnt > 1) { + if (ssi->usrcnt > 0) { if (ssi->rate != rate) { dev_err(dev, "SSI parent/child should use same rate\n"); return -EINVAL; diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index c5934adcfd01..c74991dd18ab 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -79,7 +79,7 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, break; case 9: for (i = 0; i < 4; i++) - rsnd_mod_write(mod, SSI_SYS_STATUS((i * 2) + 1), 0xf << (id * 4)); + rsnd_mod_write(mod, SSI_SYS_STATUS((i * 2) + 1), 0xf << 4); break; } |