aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/cs423x/cs4236_lib.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/isa/cs423x/cs4236_lib.c')
-rw-r--r--sound/isa/cs423x/cs4236_lib.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index e36981d64ec5..7a5a6c71f5e4 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -644,7 +644,7 @@ static int snd_cs4236_put_master_digital(struct snd_kcontrol *kcontrol, struct s
644 val2 = (chip->eimage[CS4236_REG(CS4236_RIGHT_MASTER)] & ~0x7f) | val2; 644 val2 = (chip->eimage[CS4236_REG(CS4236_RIGHT_MASTER)] & ~0x7f) | val2;
645 change = val1 != chip->eimage[CS4236_REG(CS4236_LEFT_MASTER)] || val2 != chip->eimage[CS4236_REG(CS4236_RIGHT_MASTER)]; 645 change = val1 != chip->eimage[CS4236_REG(CS4236_LEFT_MASTER)] || val2 != chip->eimage[CS4236_REG(CS4236_RIGHT_MASTER)];
646 snd_cs4236_ext_out(chip, CS4236_LEFT_MASTER, val1); 646 snd_cs4236_ext_out(chip, CS4236_LEFT_MASTER, val1);
647 snd_cs4236_ext_out(chip, CS4236_RIGHT_MASTER, val1); 647 snd_cs4236_ext_out(chip, CS4236_RIGHT_MASTER, val2);
648 spin_unlock_irqrestore(&chip->reg_lock, flags); 648 spin_unlock_irqrestore(&chip->reg_lock, flags);
649 return change; 649 return change;
650} 650}
@@ -841,7 +841,7 @@ static int snd_cs4236_put_iec958_switch(struct snd_kcontrol *kcontrol, struct sn
841 841
842 enable = ucontrol->value.integer.value[0] & 1; 842 enable = ucontrol->value.integer.value[0] & 1;
843 843
844 down(&chip->mce_mutex); 844 mutex_lock(&chip->mce_mutex);
845 snd_cs4231_mce_up(chip); 845 snd_cs4231_mce_up(chip);
846 spin_lock_irqsave(&chip->reg_lock, flags); 846 spin_lock_irqsave(&chip->reg_lock, flags);
847 val = (chip->image[CS4231_ALT_FEATURE_1] & ~0x0e) | (0<<2) | (enable << 1); 847 val = (chip->image[CS4231_ALT_FEATURE_1] & ~0x0e) | (0<<2) | (enable << 1);
@@ -854,7 +854,7 @@ static int snd_cs4236_put_iec958_switch(struct snd_kcontrol *kcontrol, struct sn
854 snd_cs4236_ctrl_out(chip, 4, val); 854 snd_cs4236_ctrl_out(chip, 4, val);
855 spin_unlock_irqrestore(&chip->reg_lock, flags); 855 spin_unlock_irqrestore(&chip->reg_lock, flags);
856 snd_cs4231_mce_down(chip); 856 snd_cs4231_mce_down(chip);
857 up(&chip->mce_mutex); 857 mutex_unlock(&chip->mce_mutex);
858 858
859#if 0 859#if 0
860 printk("set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n", 860 printk("set valid: ALT = 0x%x, C3 = 0x%x, C4 = 0x%x, C5 = 0x%x, C6 = 0x%x, C8 = 0x%x\n",