[ALSA] dbri - Fix broken change for value range checks

The last patch for value range checks included a broken merge result.
Now fixed properly.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index af1bf4b..fc68317 100644 (file)
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2292,12 +2292,12 @@ static int snd_cs4215_put_volume(struct snd_kcontrol *kcontrol,
                        return -EINVAL;
        }
 
-       if (info->left_gain != 
-               info->left_gain = ucontrol->value.integer.value[0];
+       if (info->left_gain != vol[0]) {
+               info->left_gain = vol[0];
                changed = 1;
        }
-       if (info->right_gain != ucontrol->value.integer.value[1]) {
-               info->right_gain = ucontrol->value.integer.value[1];
+       if (info->right_gain != vol[1]) {
+               info->right_gain = vol[1];
                changed = 1;
        }
        if (changed) {