summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:52:08 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:52:08 +0100
commitca945cf9fb887ff64e63f324a9098a1bd848c58f (patch)
tree152318db450922890773c170e946cf40b70f31f2 /sound
parent4253f3a8f4c7835a95dbdef232ad81d0af88fab3 (diff)
parent48f403be3eb9b603cfaf946ca7a0c76272750469 (diff)
downloadlinux-ca945cf9fb887ff64e63f324a9098a1bd848c58f.tar.bz2
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/pcm1681.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index e7ba557979cb..490970e5ab8c 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -95,17 +95,22 @@ static int pcm1681_set_deemph(struct snd_soc_codec *codec)
struct pcm1681_private *priv = snd_soc_codec_get_drvdata(codec);
int i = 0, val = -1, enable = 0;
- if (priv->deemph)
- for (i = 0; i < ARRAY_SIZE(pcm1681_deemph); i++)
- if (pcm1681_deemph[i] == priv->rate)
+ if (priv->deemph) {
+ for (i = 0; i < ARRAY_SIZE(pcm1681_deemph); i++) {
+ if (pcm1681_deemph[i] == priv->rate) {
val = i;
+ break;
+ }
+ }
+ }
if (val != -1) {
regmap_update_bits(priv->regmap, PCM1681_DEEMPH_CONTROL,
PCM1681_DEEMPH_RATE_MASK, val << 3);
enable = 1;
- } else
+ } else {
enable = 0;
+ }
/* enable/disable deemphasis functionality */
return regmap_update_bits(priv->regmap, PCM1681_DEEMPH_CONTROL,