aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/soc-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fe1df50805a3..3477525247c3 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2818,7 +2818,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
2818 unsigned int mask = (1 << fls(max)) - 1; 2818 unsigned int mask = (1 << fls(max)) - 1;
2819 unsigned int invert = mc->invert; 2819 unsigned int invert = mc->invert;
2820 int err; 2820 int err;
2821 bool type_2r = 0; 2821 bool type_2r = false;
2822 unsigned int val2 = 0; 2822 unsigned int val2 = 0;
2823 unsigned int val, val_mask; 2823 unsigned int val, val_mask;
2824 2824
@@ -2836,7 +2836,7 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
2836 val |= val2 << rshift; 2836 val |= val2 << rshift;
2837 } else { 2837 } else {
2838 val2 = val2 << shift; 2838 val2 = val2 << shift;
2839 type_2r = 1; 2839 type_2r = true;
2840 } 2840 }
2841 } 2841 }
2842 err = snd_soc_update_bits_locked(codec, reg, val_mask, val); 2842 err = snd_soc_update_bits_locked(codec, reg, val_mask, val);