diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-30 15:04:22 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-30 15:04:22 +0000 |
commit | ab3bd08a257d4b92384de2720b7294b444578ba5 (patch) | |
tree | 65ef68d6c3861b5b5d84d3876cde0941694f2c88 /arch/arm/plat-mxc/gpio.c | |
parent | 9c6568501cbf731a910db2fcb7d094977dcb154c (diff) | |
parent | 2eca047b289307594d0d6ce62c8237fa9c5b9b5e (diff) |
Merge branch 'for-rmk-rc' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/plat-mxc/gpio.c')
-rw-r--r-- | arch/arm/plat-mxc/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c index 733e0acac916..de5c4747453f 100644 --- a/arch/arm/plat-mxc/gpio.c +++ b/arch/arm/plat-mxc/gpio.c @@ -188,7 +188,7 @@ static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset) struct mxc_gpio_port *port = container_of(chip, struct mxc_gpio_port, chip); - return (__raw_readl(port->base + GPIO_DR) >> offset) & 1; + return (__raw_readl(port->base + GPIO_PSR) >> offset) & 1; } static int mxc_gpio_direction_input(struct gpio_chip *chip, unsigned offset) |