diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2017-09-11 04:17:26 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2017-09-13 09:44:07 -0700 |
| commit | b7165d26bf730567ab081bb9383aff82cd43d9ea (patch) | |
| tree | 902930defeea22cf5924fa7e65492fad7fc03c16 | |
| parent | Merge remote-tracking branches 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next (diff) | |
| download | wireguard-linux-b7165d26bf730567ab081bb9383aff82cd43d9ea.tar.xz wireguard-linux-b7165d26bf730567ab081bb9383aff82cd43d9ea.zip | |
ASoC: rsnd: fix ADG flags
Current ADG driver is over-writing flags. This patch fixes it.
Reported-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/sh/rcar/adg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 938baff86ef2..e11ce5036bcf 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -479,10 +479,10 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, } if (req_rate[0] % 48000 == 0) - adg->flags = AUDIO_OUT_48; + adg->flags |= AUDIO_OUT_48; if (of_get_property(np, "clkout-lr-asynchronous", NULL)) - adg->flags = LRCLK_ASYNC; + adg->flags |= LRCLK_ASYNC; /* * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC |