diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-11 18:24:58 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-11 19:50:15 +0300 |
| commit | 815ad8623695c7f2aafc216b923b131f1ee12df6 (patch) | |
| tree | f66eeed2a0dfd011a6207360b81c18e3ffabb583 /sound/soc/sh/rcar/ssiu.c | |
| parent | 56f27013482c0803d978b667fe85de04ce9357cd (diff) | |
| parent | d0021d3bdfe9d551859bca1f58da0e6be8e26043 (diff) | |
| download | linux-815ad8623695c7f2aafc216b923b131f1ee12df6.tar.xz | |
Merge tag 'asoc-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Last updates for v4.5
A bunch more updates for v4.5, mainly driver work:
- More topology API enhancements from Mengdong Lin working towards
making everything more component based and being able to specify PCM
links via topology.
- Large sets driver updates from Cirrus, Intel (mainly more Skylake
support) and Renesas.
- New driver for AMD ACP
- Rename PCM1792a driver to be generic pcm179x
Diffstat (limited to 'sound/soc/sh/rcar/ssiu.c')
| -rw-r--r-- | sound/soc/sh/rcar/ssiu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 3fe9e08e81a3..06d72828e5bc 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -73,7 +73,7 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod, switch (multi_ssi_slaves) { case 0x0206: /* SSI0/1/2/9 */ val2 = (1 << 4) | /* SSI0129 sync */ - rsnd_rdai_is_clk_master(rdai) ? 0x2 : 0x1; + (rsnd_rdai_is_clk_master(rdai) ? 0x2 : 0x1); /* fall through */ case 0x0006: /* SSI0/1/2 */ val1 = rsnd_rdai_is_clk_master(rdai) ? |