summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPaul Parsons <lost.distance@yahoo.com>2012-03-13 13:11:30 +0000
committerHaojian Zhuang <haojian.zhuang@gmail.com>2012-03-14 16:45:24 +0800
commit95a50cab1dc6446fb1a91d20e14b649dd9f41f1c (patch)
tree153d2b4f4e2393a0651e699f5d3674549257bff1 /arch/arm
parentfde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff)
downloadlinux-95a50cab1dc6446fb1a91d20e14b649dd9f41f1c.tar.gz
linux-95a50cab1dc6446fb1a91d20e14b649dd9f41f1c.tar.bz2
linux-95a50cab1dc6446fb1a91d20e14b649dd9f41f1c.zip
ARM: pxa/hx4700: Remove unwanted request for GPIO105
GPIO105 (nIR_ON) is requested twice: first in gpio_request_array(), then in pxa_irda_probe(). Consequently the second request fails with EBUSY: pxa2xx-ir: probe of pxa2xx-ir failed with error -16 This patch removes the first request, allowing pxa_irda_probe() to succeed. Signed-off-by: Paul Parsons <lost.distance@yahoo.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/hx4700.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
index 208eef1c0485..c5fb105d2689 100644
--- a/arch/arm/mach-pxa/hx4700.c
+++ b/arch/arm/mach-pxa/hx4700.c
@@ -830,7 +830,6 @@ static struct gpio global_gpios[] = {
{ GPIO32_HX4700_RS232_ON, GPIOF_OUT_INIT_HIGH, "RS232_ON" },
{ GPIO71_HX4700_ASIC3_nRESET, GPIOF_OUT_INIT_HIGH, "ASIC3_nRESET" },
{ GPIO82_HX4700_EUART_RESET, GPIOF_OUT_INIT_HIGH, "EUART_RESET" },
- { GPIO105_HX4700_nIR_ON, GPIOF_OUT_INIT_HIGH, "nIR_EN" },
};
static void __init hx4700_init(void)