Merge branch 'topic/usb-audio' into for-linus

[pandora-kernel.git] / arch / arm / mach-pxa / zylonite_pxa300.c

diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c
index cefd1c0..8409544 100644 (file)
--- a/arch/arm/mach-pxa/zylonite_pxa300.c
+++ b/arch/arm/mach-pxa/zylonite_pxa300.c
@@ -197,10 +197,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 */