Commit 4581aa36 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent dec44dbe

sound/sparc/dbri.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {