diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-01-06 12:38:41 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-06 10:38:39 +0000 |
| commit | 8012c983dd0cea8f5be5a02ca75fd8d437227a10 (patch) | |
| tree | 4e4d7b7129c27b317e6f456c4b3d860298e8c47c /sound | |
| parent | e5d9cfc6f5fe56caa44cefbc7ef4531c480d901d (diff) | |
| download | linux-stable-8012c983dd0cea8f5be5a02ca75fd8d437227a10.tar.gz linux-stable-8012c983dd0cea8f5be5a02ca75fd8d437227a10.tar.bz2 linux-stable-8012c983dd0cea8f5be5a02ca75fd8d437227a10.zip | |
ASoC: rsnd: precedence error in rsnd_ssiu_init()
The bitwise OR has higher precedence than ?: so the val2 was always set
to 0x2.
Fixes: b4c83b171557 ('ASoC: rsnd: add Multi channel support')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -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) ? |