diff options
| author | Mark Brown <broonie@kernel.org> | 2017-03-29 12:55:05 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-03-29 12:55:05 +0100 |
| commit | 0cb3a12f2a5827ff8692ff247538683b1b1f979d (patch) | |
| tree | 999471206b77a695c231d4cd6be04e71279eb335 /sound/soc/sh/rcar/ssiu.c | |
| parent | 4368c27666df1f1e80aa525baf49d29073c28ce7 (diff) | |
| parent | 9986943ef5d61a9bea3c86000d91d3b789f0060e (diff) | |
| download | op-kernel-dev-0cb3a12f2a5827ff8692ff247538683b1b1f979d.zip op-kernel-dev-0cb3a12f2a5827ff8692ff247538683b1b1f979d.tar.gz | |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound/soc/sh/rcar/ssiu.c')
| -rw-r--r-- | sound/soc/sh/rcar/ssiu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 4e817c8..14fafda 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -64,7 +64,11 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, mask1 = (1 << 4) | (1 << 20); /* mask sync bit */ mask2 = (1 << 4); /* mask sync bit */ val1 = val2 = 0; - if (rsnd_ssi_is_pin_sharing(io)) { + if (id == 8) { + /* + * SSI8 pin is sharing with SSI7, nothing to do. + */ + } else if (rsnd_ssi_is_pin_sharing(io)) { int shift = -1; switch (id) { |
