From f3765233db270504659e427eb2eade8365e5bc65 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Wed, 29 Aug 2007 23:23:38 +0100 Subject: [PATCH] --- yaml --- r: 64579 b: refs/heads/master c: a98b38b83db3d377ede6b72cebe7ed2dc4127766 h: refs/heads/master i: 64577: 3466099f3902214a77c693772c2e4c89aa6321b6 64575: e74a23dbea1e43175f63e901f7c66e5a5c2860d8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-imx/generic.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb3dbfbd45b1..573c5f92c23a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd51bcc5dc4073b18308f25846aa3b421fa3c42e +refs/heads/master: a98b38b83db3d377ede6b72cebe7ed2dc4127766 diff --git a/trunk/arch/arm/mach-imx/generic.c b/trunk/arch/arm/mach-imx/generic.c index c342595dc318..4cfc9d3af28a 100644 --- a/trunk/arch/arm/mach-imx/generic.c +++ b/trunk/arch/arm/mach-imx/generic.c @@ -101,10 +101,11 @@ EXPORT_SYMBOL(imx_gpio_mode); int imx_gpio_request(unsigned gpio, const char *label) { - if(gpio >= (GPIO_PORT_MAX + 1) * 32) + if(gpio >= (GPIO_PORT_MAX + 1) * 32) { printk(KERN_ERR "imx_gpio: Attempt to request nonexistent GPIO %d for \"%s\"\n", gpio, label ? label : "?"); return -EINVAL; + } if(test_and_set_bit(gpio, imx_gpio_alloc_map)) { printk(KERN_ERR "imx_gpio: GPIO %d already used. Allocation for \"%s\" failed\n", @@ -129,7 +130,7 @@ EXPORT_SYMBOL(imx_gpio_free); int imx_gpio_direction_input(unsigned gpio) { - imx_gpio_mode(gpio| GPIO_IN); + imx_gpio_mode(gpio | GPIO_IN | GPIO_GIUS | GPIO_DR); return 0; }