[PATCHv4 3/4] OMAP3: Devkit8000: Check return value of gpio_request
From: Thomas Weber <hidden>
Date: 2011-01-19 08:19:40
Also in:
linux-omap, lkml
Subsystem:
arm port, omap2+ support, the rest · Maintainers:
Russell King, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
The return value of gpio_request is ignored. This patch adds the check of the return value of gpio_request. Signed-off-by: Thomas Weber <redacted> --- arch/arm/mach-omap2/board-devkit8000.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index 9fb416b..4ddd81c 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c@@ -234,6 +234,8 @@ static struct gpio_led gpio_leds[]; static int devkit8000_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio) { + int ret; + omap_mux_init_gpio(29, OMAP_PIN_INPUT); /* gpio + 0 is "mmc0_cd" (input/IRQ) */ mmc[0].gpio_cd = gpio + 0;
@@ -244,13 +246,23 @@ static int devkit8000_twl_gpio_setup(struct device *dev, /* TWL4030_GPIO_MAX + 0 is "LCD_PWREN" (out, active high) */ devkit8000_lcd_device.reset_gpio = gpio + TWL4030_GPIO_MAX + 0; - gpio_request(devkit8000_lcd_device.reset_gpio, "LCD_PWREN"); + ret = gpio_request(devkit8000_lcd_device.reset_gpio, "LCD_PWREN"); + if (ret < 0) { + printk(KERN_ERR "Failed to request GPIO for LCD_PWRN\n"); + return ret; + } + /* Disable until needed */ gpio_direction_output(devkit8000_lcd_device.reset_gpio, 0); /* gpio + 7 is "DVI_PD" (out, active low) */ devkit8000_dvi_device.reset_gpio = gpio + 7; - gpio_request(devkit8000_dvi_device.reset_gpio, "DVI PowerDown"); + ret = gpio_request(devkit8000_dvi_device.reset_gpio, "DVI PowerDown"); + if (ret < 0) { + printk(KERN_ERR "Failed to request GPIO for DVI PowerDown\n"); + return ret; + } + /* Disable until needed */ gpio_direction_output(devkit8000_dvi_device.reset_gpio, 0);
--
1.7.4.rc2