diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-11-20 18:31:22 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2008-01-31 17:29:26 +0100 |
| commit | 4581aa36fc8273579f6b7979adc4f4e666460a8d (patch) | |
| tree | aba61bcf6f9bd07ef25a7ea8001df2e681ecbb39 /sound/sparc | |
| parent | dec44dbe017f824ce46cdd66b39fa9b98a076ce1 (diff) | |
| download | linux-3.10-4581aa36fc8273579f6b7979adc4f4e666460a8d.tar.gz linux-3.10-4581aa36fc8273579f6b7979adc4f4e666460a8d.tar.bz2 linux-3.10-4581aa36fc8273579f6b7979adc4f4e666460a8d.zip | |
[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')
| -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 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) { |