Browse Source

[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>
Takashi Iwai 17 years ago
parent
commit
4581aa36fc
1 changed files with 4 additions and 4 deletions
  1. 4 4
      sound/sparc/dbri.c

+ 4 - 4
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) {