Merge branch 'acpi-pad' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[~andy/linux] / arch / arm / mach-pxa / zylonite_pxa320.c

diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c
index cc5a22833605e27e99980c866781e9d0fd60b300..60d08f23f5e4ed3933e2ad9855efb8b5b9ad7332 100644 (file)
--- 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 */