Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4581aa36fc8273579f6b7979adc4f4e666460a8d
Commit:     4581aa36fc8273579f6b7979adc4f4e666460a8d
Parent:     dec44dbe017f824ce46cdd66b39fa9b98a076ce1
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 20 18:31:22 2007 +0100
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:29:26 2008 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 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 af1bf4b..fc68317 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) {
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to