ASoC: rsnd: fix ADG flags
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Mon, 11 Sep 2017 04:17:26 +0000 (04:17 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Aug 2018 19:01:11 +0000 (21:01 +0200)
commit b7165d26bf730567ab081bb9383aff82cd43d9ea upstream.

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>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/sh/rcar/adg.c

index 2684a2ba33cd366474ea8b056872ca469aeba72e..e28edb1f72635c9437cbed7072b6dcc9e8c31186 100644 (file)
@@ -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