diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-30 10:46:12 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-30 10:46:12 +0100 |
| commit | 5dbc80f69e131ecca42a5958b7785a57851c80d7 (patch) | |
| tree | 8de1ab7fbea2a342dd023ea836c570c7a95ef764 /arch/arm/mach-pxa/zylonite_pxa320.c | |
| parent | 3ef7143d2287b21e09e00a25a8cb4fbdcf0c6c4c (diff) | |
| parent | 1d3e216f1d303878d7204de94dee251bc2702175 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/zylonite_pxa320.c')
| -rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index cc5a2283360..60d08f23f5e 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c @@ -176,10 +176,12 @@ static void __init zylonite_detect_lcd_panel(void) for (i = 0; i < NUM_LCD_DETECT_PINS; i++) { id = id << 1; gpio = mfp_to_gpio(lcd_detect_pins[i]); + gpio_request(gpio, "LCD_ID_PINS"); gpio_direction_input(gpio); if (gpio_get_value(gpio)) id = id | 0x1; + gpio_free(gpio); } /* lcd id, flush out bit 1 */ |