diff options
author | Paul Parsons <lost.distance@yahoo.com> | 2012-03-13 09:11:30 -0400 |
---|---|---|
committer | Haojian Zhuang <haojian.zhuang@gmail.com> | 2012-03-14 04:45:24 -0400 |
commit | 95a50cab1dc6446fb1a91d20e14b649dd9f41f1c (patch) | |
tree | 153d2b4f4e2393a0651e699f5d3674549257bff1 /arch/arm/mach-pxa/hx4700.c | |
parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) |
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/mach-pxa/hx4700.c')
-rw-r--r-- | arch/arm/mach-pxa/hx4700.c | 1 |
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[] = { | |||
830 | { GPIO32_HX4700_RS232_ON, GPIOF_OUT_INIT_HIGH, "RS232_ON" }, | 830 | { GPIO32_HX4700_RS232_ON, GPIOF_OUT_INIT_HIGH, "RS232_ON" }, |
831 | { GPIO71_HX4700_ASIC3_nRESET, GPIOF_OUT_INIT_HIGH, "ASIC3_nRESET" }, | 831 | { GPIO71_HX4700_ASIC3_nRESET, GPIOF_OUT_INIT_HIGH, "ASIC3_nRESET" }, |
832 | { GPIO82_HX4700_EUART_RESET, GPIOF_OUT_INIT_HIGH, "EUART_RESET" }, | 832 | { GPIO82_HX4700_EUART_RESET, GPIOF_OUT_INIT_HIGH, "EUART_RESET" }, |
833 | { GPIO105_HX4700_nIR_ON, GPIOF_OUT_INIT_HIGH, "nIR_EN" }, | ||
834 | }; | 833 | }; |
835 | 834 | ||
836 | static void __init hx4700_init(void) | 835 | static void __init hx4700_init(void) |