Merge branch 'fix/misc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / board-zoom-debugboard.c

diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c
index e0948c9229883c4017c68af1493e84c0474e5ad6..1f13e2a1f322178c7878d0fb9a54fc6f519328b2 100644 (file)
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -129,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;
 
@@ -140,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 = {