Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / soc-ops.c

diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c
index a513a34a51d299a8bf7d9ef7799717ceb4a42430..9fc1a7bb8b953a7a2955ea1ca2d31b30fccfee37 100644 (file)
--- a/sound/soc/soc-ops.c
+++ b/sound/soc/soc-ops.c
@@ -77,7 +77,7 @@ int snd_soc_get_enum_double(struct snd_kcontrol *kcontrol,
        item = snd_soc_enum_val_to_item(e, val);
        ucontrol->value.enumerated.item[0] = item;
        if (e->shift_l != e->shift_r) {
-               val = (reg_val >> e->shift_l) & e->mask;
+               val = (reg_val >> e->shift_r) & e->mask;
                item = snd_soc_enum_val_to_item(e, val);
                ucontrol->value.enumerated.item[1] = item;
        }