From 4581aa36fc8273579f6b7979adc4f4e666460a8d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 20 Nov 2007 18:31:22 +0100 Subject: [PATCH] [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 Signed-off-by: Jaroslav Kysela --- sound/sparc/dbri.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index af1bf4bf94..fc683174f2 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) { -- 2.39.5