From patchwork Wed Jan 19 08:19:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Weber X-Patchwork-Id: 488551 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0J8KQSo031681 for ; Wed, 19 Jan 2011 08:20:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753709Ab1ASITj (ORCPT ); Wed, 19 Jan 2011 03:19:39 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:59887 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753701Ab1ASITi (ORCPT ); Wed, 19 Jan 2011 03:19:38 -0500 Received: from corscience.de (DSL01.212.114.252.242.ip-pool.NEFkom.net [212.114.252.242]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0Mgrp6-1Psiot1Lrk-00MSi8; Wed, 19 Jan 2011 09:19:31 +0100 Received: from Lupus.CS.local (unknown [192.168.102.87]) by corscience.de (Postfix) with ESMTP id 95AB75213C; Wed, 19 Jan 2011 09:19:30 +0100 (CET) From: Thomas Weber To: linux-omap@vger.kernel.org Cc: Thomas Weber , Tony Lindgren , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Morsing , charu@ti.com, sshtylyov@mvista.com Subject: [PATCHv4 3/4] OMAP3: Devkit8000: Check return value of gpio_request Date: Wed, 19 Jan 2011 09:19:25 +0100 Message-Id: <1295425166-25540-4-git-send-email-weber@corscience.de> X-Mailer: git-send-email 1.7.4.rc2 In-Reply-To: <1295425166-25540-1-git-send-email-weber@corscience.de> References: <1295425166-25540-1-git-send-email-weber@corscience.de> X-Provags-ID: V02:K0:rCKK8RVbFSBC0+1XMmoIU5Rc2Hjh9fh4hc7/4BuhIzy 0GXtBReUxrZQbASrWQhpxQyp3MarWAUBMEnGn6AVU0z8mweXgi N5VC5OjXy1fjrfhmuThGEEuEUIjPfnD5b4h+eZTqQm53AyMp+V zFvAFlurZ1tayqvHxptuhBiHKjQtg5v1aBTuuniBiEnKk0XKIM FDWallbo2kqYRNeYniOLw== Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 19 Jan 2011 08:20:27 +0000 (UTC) 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);