From a51624fa58cce89eb4012b63a51cdc3989f1d2b4 Mon Sep 17 00:00:00 2001 From: Karsten Wiese Date: Tue, 22 Apr 2008 12:52:45 +0200 Subject: [PATCH] --- yaml --- r: 92234 b: refs/heads/master c: 775c199e6af5e4212bfa7ebeadee09563c14694b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/ice1712/ice1712.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index debd62552da5..b83670ed9cb4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 988f0664779674c7c06252a6d549eee8debd5d76 +refs/heads/master: 775c199e6af5e4212bfa7ebeadee09563c14694b diff --git a/trunk/sound/pci/ice1712/ice1712.h b/trunk/sound/pci/ice1712/ice1712.h index a3bea2247c7f..3208901c740e 100644 --- a/trunk/sound/pci/ice1712/ice1712.h +++ b/trunk/sound/pci/ice1712/ice1712.h @@ -438,10 +438,14 @@ int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu static inline void snd_ice1712_gpio_write_bits(struct snd_ice1712 *ice, unsigned int mask, unsigned int bits) { + unsigned val; + ice->gpio.direction |= mask; snd_ice1712_gpio_set_dir(ice, ice->gpio.direction); - snd_ice1712_gpio_set_mask(ice, ~mask); - snd_ice1712_gpio_write(ice, mask & bits); + val = snd_ice1712_gpio_read(ice); + val &= ~mask; + val |= mask & bits; + snd_ice1712_gpio_write(ice, val); } static inline int snd_ice1712_gpio_read_bits(struct snd_ice1712 *ice,