diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/ice1712/ice1712.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h index a3bea2247c7f..3208901c740e 100644 --- a/sound/pci/ice1712/ice1712.h +++ b/sound/pci/ice1712/ice1712.h | |||
@@ -438,10 +438,14 @@ int snd_ice1712_gpio_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_valu | |||
438 | static inline void snd_ice1712_gpio_write_bits(struct snd_ice1712 *ice, | 438 | static inline void snd_ice1712_gpio_write_bits(struct snd_ice1712 *ice, |
439 | unsigned int mask, unsigned int bits) | 439 | unsigned int mask, unsigned int bits) |
440 | { | 440 | { |
441 | unsigned val; | ||
442 | |||
441 | ice->gpio.direction |= mask; | 443 | ice->gpio.direction |= mask; |
442 | snd_ice1712_gpio_set_dir(ice, ice->gpio.direction); | 444 | snd_ice1712_gpio_set_dir(ice, ice->gpio.direction); |
443 | snd_ice1712_gpio_set_mask(ice, ~mask); | 445 | val = snd_ice1712_gpio_read(ice); |
444 | snd_ice1712_gpio_write(ice, mask & bits); | 446 | val &= ~mask; |
447 | val |= mask & bits; | ||
448 | snd_ice1712_gpio_write(ice, val); | ||
445 | } | 449 | } |
446 | 450 | ||
447 | static inline int snd_ice1712_gpio_read_bits(struct snd_ice1712 *ice, | 451 | static inline int snd_ice1712_gpio_read_bits(struct snd_ice1712 *ice, |