diff options
| author | Mark Brown <broonie@kernel.org> | 2015-07-24 16:18:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-07-24 16:18:18 +0100 |
| commit | 66874cc145cbbea3a236e30b15c8f8378708aa31 (patch) | |
| tree | d096d87429808830143787b88ca02e7cd6473235 /sound/soc | |
| parent | 61710a655fa60a7b3e0fd4731bc8403df647b7a3 (diff) | |
| parent | fa8173a3ef0570affde7da352de202190b3786c2 (diff) | |
| download | linux-stable-66874cc145cbbea3a236e30b15c8f8378708aa31.tar.gz linux-stable-66874cc145cbbea3a236e30b15c8f8378708aa31.tar.bz2 linux-stable-66874cc145cbbea3a236e30b15c8f8378708aa31.zip | |
Merge remote-tracking branch 'asoc/fix/pcm1681' into asoc-linus
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/pcm1681.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c index 477e13d30971..e7ba557979cb 100644 --- a/sound/soc/codecs/pcm1681.c +++ b/sound/soc/codecs/pcm1681.c @@ -102,7 +102,7 @@ static int pcm1681_set_deemph(struct snd_soc_codec *codec) if (val != -1) { regmap_update_bits(priv->regmap, PCM1681_DEEMPH_CONTROL, - PCM1681_DEEMPH_RATE_MASK, val); + PCM1681_DEEMPH_RATE_MASK, val << 3); enable = 1; } else enable = 0; |