1 files changed, 7 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c
index bac5c4321ff7..1f13e2a1f322 100644
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -12,6 +12,7 @@
 #include <linux/gpio.h>
 #include <linux/serial_8250.h>
 #include <linux/smsc911x.h>
+#include <linux/interrupt.h>
 
 #include <mach/gpmc.h>
 
@@ -84,6 +85,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
                 .mapbase        = 0x10000000,
                 .irq            = OMAP_GPIO_IRQ(102),
                 .flags          = UPF_BOOT_AUTOCONF|UPF_IOREMAP|UPF_SHARE_IRQ,
+                .irqflags       = IRQF_SHARED | IRQF_TRIGGER_RISING,
                 .iotype         = UPIO_MEM,
                 .regshift       = 1,
                 .uartclk        = QUART_CLK,
@@ -94,7 +96,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device zoom2_debugboard_serial_device = {
         .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM1,
+        .id                     = 3,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
@@ -127,6 +129,7 @@ static inline void __init zoom2_init_quaduart(void)
 static inline int omap_zoom2_debugboard_detect(void)
 {
         int debug_board_detect = 0;
+        int ret = 1;
 
         debug_board_detect = ZOOM2_SMSC911X_GPIO;
 
@@ -138,10 +141,10 @@ static inline int omap_zoom2_debugboard_detect(void)
         gpio_direction_input(debug_board_detect);
 
         if (!gpio_get_value(debug_board_detect)) {
-                gpio_free(debug_board_detect);
-                return 0;
+                ret = 0;
         }
-        return 1;
+        gpio_free(debug_board_detect);
+        return ret;
 }
 
 static struct platform_device *zoom2_devices[] __initdata = {