diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /sound/pci/hda/patch_analog.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index be7d25fa7f35..3da85caf8af1 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -3754,7 +3754,7 @@ static int ad1884a_mobile_master_sw_put(struct snd_kcontrol *kcontrol, | |||
| 3754 | int mute = (!ucontrol->value.integer.value[0] && | 3754 | int mute = (!ucontrol->value.integer.value[0] && |
| 3755 | !ucontrol->value.integer.value[1]); | 3755 | !ucontrol->value.integer.value[1]); |
| 3756 | /* toggle GPIO1 according to the mute state */ | 3756 | /* toggle GPIO1 according to the mute state */ |
| 3757 | snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, | 3757 | snd_hda_codec_write_cache(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, |
| 3758 | mute ? 0x02 : 0x0); | 3758 | mute ? 0x02 : 0x0); |
| 3759 | return ret; | 3759 | return ret; |
| 3760 | } | 3760 | } |