diff options
author | Takashi Iwai <tiwai@suse.de> | 2007-11-20 12:31:22 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 11:29:26 -0500 |
commit | 4581aa36fc8273579f6b7979adc4f4e666460a8d (patch) | |
tree | aba61bcf6f9bd07ef25a7ea8001df2e681ecbb39 /sound/sparc/dbri.c | |
parent | dec44dbe017f824ce46cdd66b39fa9b98a076ce1 (diff) |
[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>
Diffstat (limited to 'sound/sparc/dbri.c')
-rw-r--r-- | sound/sparc/dbri.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index af1bf4bf9459..fc683174f2c7 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, | |||
2292 | return -EINVAL; | 2292 | return -EINVAL; |
2293 | } | 2293 | } |
2294 | 2294 | ||
2295 | if (info->left_gain != | 2295 | if (info->left_gain != vol[0]) { |
2296 | info->left_gain = ucontrol->value.integer.value[0]; | 2296 | info->left_gain = vol[0]; |
2297 | changed = 1; | 2297 | changed = 1; |
2298 | } | 2298 | } |
2299 | if (info->right_gain != ucontrol->value.integer.value[1]) { | 2299 | if (info->right_gain != vol[1]) { |
2300 | info->right_gain = ucontrol->value.integer.value[1]; | 2300 | info->right_gain = vol[1]; |
2301 | changed = 1; | 2301 | changed = 1; |
2302 | } | 2302 | } |
2303 | if (changed) { | 2303 | if (changed) { |