diff options
| author | Mark Brown <broonie@kernel.org> | 2019-07-06 13:25:24 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-07-06 13:25:24 +0200 |
| commit | 0dceaf7c798de953c74073cc77be40b7be49abbc (patch) | |
| tree | 8014fcd5783090ced8024d71d3d943676033af8e /sound/soc/codecs/ad193x.c | |
| parent | Linux 5.2-rc7 (diff) | |
| parent | ASoC: audio-graph-card: fix use-after-free in graph_for_each_link (diff) | |
| download | linux-0dceaf7c798de953c74073cc77be40b7be49abbc.tar.xz linux-0dceaf7c798de953c74073cc77be40b7be49abbc.zip | |
Merge branch 'asoc-5.2' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/ad193x.c')
| -rw-r--r-- | sound/soc/codecs/ad193x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/ad193x.c b/sound/soc/codecs/ad193x.c index 05f4514048e2..3ebc0524f4b2 100644 --- a/sound/soc/codecs/ad193x.c +++ b/sound/soc/codecs/ad193x.c @@ -240,10 +240,8 @@ static int ad193x_set_dai_fmt(struct snd_soc_dai *codec_dai, } /* For DSP_*, LRCLK's polarity must be inverted */ - if (fmt & SND_SOC_DAIFMT_DSP_A) { - change_bit(ffs(AD193X_DAC_LEFT_HIGH) - 1, - (unsigned long *)&dac_fmt); - } + if (fmt & SND_SOC_DAIFMT_DSP_A) + dac_fmt ^= AD193X_DAC_LEFT_HIGH; switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & frm master */ |