diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-03-23 08:14:02 -0400 |
| commit | 3372dbdd8ca11f51be8c6a30b2bc79eb04c4a902 (patch) | |
| tree | d4499bf5a5665b4820ffaf96bce55bf6b895195e /sound/pci/cmipci.c | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
| parent | 967b1307b69b8ada8b331e01046ad1ef83742e99 (diff) | |
Merge branch 'for-next' into topic/hda-core
Diffstat (limited to 'sound/pci/cmipci.c')
| -rw-r--r-- | sound/pci/cmipci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/cmipci.c b/sound/pci/cmipci.c index 1d0f2cad2f5a..6cf464d9043d 100644 --- a/sound/pci/cmipci.c +++ b/sound/pci/cmipci.c | |||
| @@ -2062,7 +2062,7 @@ static int snd_cmipci_get_volume(struct snd_kcontrol *kcontrol, | |||
| 2062 | val = (snd_cmipci_mixer_read(cm, reg.right_reg) >> reg.right_shift) & reg.mask; | 2062 | val = (snd_cmipci_mixer_read(cm, reg.right_reg) >> reg.right_shift) & reg.mask; |
| 2063 | if (reg.invert) | 2063 | if (reg.invert) |
| 2064 | val = reg.mask - val; | 2064 | val = reg.mask - val; |
| 2065 | ucontrol->value.integer.value[1] = val; | 2065 | ucontrol->value.integer.value[1] = val; |
| 2066 | } | 2066 | } |
| 2067 | spin_unlock_irq(&cm->reg_lock); | 2067 | spin_unlock_irq(&cm->reg_lock); |
| 2068 | return 0; | 2068 | return 0; |