diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/gpio/pch_gpio.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/gpio/pch_gpio.c')
| -rw-r--r-- | drivers/gpio/pch_gpio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpio/pch_gpio.c b/drivers/gpio/pch_gpio.c index 2c6af8705103..f970a5f3585e 100644 --- a/drivers/gpio/pch_gpio.c +++ b/drivers/gpio/pch_gpio.c | |||
| @@ -105,6 +105,7 @@ static int pch_gpio_direction_output(struct gpio_chip *gpio, unsigned nr, | |||
| 105 | reg_val |= (1 << nr); | 105 | reg_val |= (1 << nr); |
| 106 | else | 106 | else |
| 107 | reg_val &= ~(1 << nr); | 107 | reg_val &= ~(1 << nr); |
| 108 | iowrite32(reg_val, &chip->reg->po); | ||
| 108 | 109 | ||
| 109 | mutex_unlock(&chip->lock); | 110 | mutex_unlock(&chip->lock); |
| 110 | 111 | ||