diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 16:24:13 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-08-17 16:24:13 (GMT) |
commit | 9ed887caecb9ecb0c68773a1870d143b9f28d3da (patch) | |
tree | 08c0259674f532de0d272740e4b7dcd778132fe0 /drivers/gpio | |
parent | 425faf74cd8189c87919f7e72a0101c684ee3b9f (diff) | |
parent | 326ea986ac150acdc7656d57fca647db80b50158 (diff) | |
download | u-boot-fsl-qoriq-9ed887caecb9ecb0c68773a1870d143b9f28d3da.tar.xz |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/mxc_gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 46c0255..6a572d5 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -127,10 +127,10 @@ int gpio_direction_input(unsigned gpio) int gpio_direction_output(unsigned gpio, int value) { - int ret = mxc_gpio_direction(gpio, MXC_GPIO_DIRECTION_OUT); + int ret = gpio_set_value(gpio, value); if (ret < 0) return ret; - return gpio_set_value(gpio, value); + return mxc_gpio_direction(gpio, MXC_GPIO_DIRECTION_OUT); } |