From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 20 Nov 2007 17:31:22 +0000 (+0100)
Subject: [ALSA] dbri - Fix broken change for value range checks
X-Git-Tag: v2.6.25-rc1~1127^2~233
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4581aa36fc8273579f6b7979adc4f4e666460a8d;p=linux-2.6-omap-h63xx.git

[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 af1bf4bf945..fc683174f2c 100644
--- 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) {