diff options
| author | Mark Brown <broonie@kernel.org> | 2017-05-26 12:42:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-05-26 12:42:24 +0100 |
| commit | 7a7ef5b9d563abd1f7b97b909aa38fa08b4e9d97 (patch) | |
| tree | f6030b4b6559fbb8eb5e3d84c83e5a230120febf /sound/soc/sh/rcar/adg.c | |
| parent | 5e8338db849fae05ef910de4213976a9d37e9b15 (diff) | |
| parent | e8a3ce1130134046e9da132aa4d043566df8237d (diff) | |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound/soc/sh/rcar/adg.c')
| -rw-r--r-- | sound/soc/sh/rcar/adg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 66203d107a11..d3b0dc145a56 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -507,7 +507,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbga = rbgx; adg->rbga_rate_for_441khz = rate / div; ckr |= brg_table[i] << 20; - if (req_441kHz_rate) + if (req_441kHz_rate && + !(adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } @@ -522,7 +523,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbgb = rbgx; adg->rbgb_rate_for_48khz = rate / div; ckr |= brg_table[i] << 16; - if (req_48kHz_rate) + if (req_48kHz_rate && + (adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } |