From: Paul Parsons Date: Tue, 13 Mar 2012 13:11:30 +0000 (+0000) Subject: ARM: pxa/hx4700: Remove unwanted request for GPIO105 X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=95a50cab1dc6446fb1a91d20e14b649dd9f41f1c;p=deliverable%2Flinux.git 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 Signed-off-by: Haojian Zhuang --- 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)