From 3ed65501d54f328a42e4d96781e1b127ea7ea5c9 Mon Sep 17 00:00:00 2001 From: Vikram Pandita Date: Fri, 21 Aug 2009 13:11:20 -0500 Subject: [PATCH] --- yaml --- r: 163139 b: refs/heads/master c: 2fcc81a38b699a81e47fdd655cf514c789576554 h: refs/heads/master i: 163137: 74a27311ed19552d109e1715dd827337fe5dc96c 163135: b87cc041a1b4b26ab641c21da8057d59d1e9381a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-zoom-debugboard.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6c0a31405aa0..df8773c9504e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5110b2980a1299f6c253260de385b0dc2b2308b0 +refs/heads/master: 2fcc81a38b699a81e47fdd655cf514c789576554 diff --git a/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c b/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c index e0948c922988..1f13e2a1f322 100644 --- a/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c +++ b/trunk/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 = {