summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBill Gatliff <bgat@billgatliff.com>2007-05-31 16:17:16 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-06-02 21:31:48 +0100
commit29c349d22ccda5678a7dfb732093dbd3befcefa3 (patch)
treea221d1fe28f0e1c03f68a11cc010cce3f93b225b /include
parentb6b27ae5e85fb193c08448157943b187958b8ca2 (diff)
downloadop-kernel-dev-29c349d22ccda5678a7dfb732093dbd3befcefa3.zip
op-kernel-dev-29c349d22ccda5678a7dfb732093dbd3befcefa3.tar.gz
[ARM] 4422/1: Fix default value handling in gpio_direction_output (PXA)
The default value passed through to pxa_gpio_mode() is lost due to a missing GPIO_DFLT_HIGH mask for nonzero values. The enclosed patch fixes this programming error. Signed-off-by: Bill Gatliff <bgat@billgatliff.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/arch-pxa/gpio.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/gpio.h b/include/asm-arm/arch-pxa/gpio.h
index aeba2434..9e99241 100644
--- a/include/asm-arm/arch-pxa/gpio.h
+++ b/include/asm-arm/arch-pxa/gpio.h
@@ -45,7 +45,8 @@ static inline int gpio_direction_input(unsigned gpio)
static inline int gpio_direction_output(unsigned gpio, int value)
{
- return pxa_gpio_mode(gpio | GPIO_OUT | (value ? 0 : GPIO_DFLT_LOW));
+ return pxa_gpio_mode(gpio | GPIO_OUT |
+ (value ? GPIO_DFLT_HIGH : GPIO_DFLT_LOW));
}
static inline int __gpio_get_value(unsigned gpio)
OpenPOWER on IntegriCloud