From patchwork Fri Dec 3 17:10:44 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Rodriguez X-Patchwork-Id: 378631 Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB3HAwGB012879 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 3 Dec 2010 17:11:19 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id oB3HAvsA020231 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 3 Dec 2010 11:10:57 -0600 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id oB3HAvri007306 for ; Fri, 3 Dec 2010 11:10:57 -0600 (CST) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 306D18062F for ; Fri, 3 Dec 2010 11:10:57 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id C695D80626 for ; Fri, 3 Dec 2010 11:10:46 -0600 (CST) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp51.itg.ti.com (8.13.7/8.13.7) with ESMTP id oB3HAkng028307 for ; Fri, 3 Dec 2010 11:10:46 -0600 (CST) Received: from psmtp.com (na3sys009amx239.postini.com [74.125.149.123]) by white.ext.ti.com (8.13.7/8.13.7) with SMTP id oB3HAjl5026279 for ; Fri, 3 Dec 2010 11:10:45 -0600 Received: from source ([209.85.161.173]) by na3sys009amx239.postini.com ([74.125.148.10]) with SMTP; Fri, 03 Dec 2010 09:10:45 PST Received: by gxk24 with SMTP id 24so5299149gxk.4 for ; Fri, 03 Dec 2010 09:10:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=WQhMUeW6MECQTysEeqEyvn1p9gZ3UdN9Jpwh9b0y1Oo=; b=G5qgKzmCrx4GB4uAzsar34qDgiAxiHjmzNHdk7/SrwADFwNrwt+CEvpzUxUL78Q3Rf qRhehXcoW97q9rRRexaOaI/SV5n9LIQjICNj82TfY0lTJqOSBEeAqfAKG5n4mhfH8BJP S5nA9asi9N5wsXod0q+9gvXPqpypWpqrHfHXM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=CXupvKm1Ca9ABXyKT/Nw3W5YVj+/+xM6Uuzgrqo3xtyBLynEpHIwkY6Fu8ILShjhmO ZYuxgUlMIR8JKLReul6u6+tNIlrwHSi0TtZd3Xa8sP5XInWIUS9sSNKWvPXDsz3EqL60 k2w2J8/w8t5740SFwxWC8esDo7v1xUMssae8U= MIME-Version: 1.0 Received: by 10.42.220.136 with SMTP id hy8mr503519icb.507.1291396244806; Fri, 03 Dec 2010 09:10:44 -0800 (PST) Received: by 10.42.179.136 with HTTP; Fri, 3 Dec 2010 09:10:44 -0800 (PST) In-Reply-To: References: <1291231949-23835-1-git-send-email-vm.rod25@gmail.com> <1291231949-23835-7-git-send-email-vm.rod25@gmail.com> Date: Fri, 3 Dec 2010 11:10:44 -0600 Message-ID: Subject: Re: [PATCH v9 6/6] davinci: USB1.1 support for Omapl138-Hawkboard From: Victor Rodriguez To: "Nori, Sekhar" X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-settings: 2 (0.5000:0.0750) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [db-null] Cc: "davinci-linux-open-source@linux.davincidsp.com" , Victor Rodriguez , Russell King , "linux-arm-kernel@lists.infradead.org" X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 03 Dec 2010 17:11:20 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter1.kernel.org id oB3HAwGB012879 diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c index da51136..8fc78f2 100644 --- a/arch/arm/mach-davinci/board-omapl138-hawk.c +++ b/arch/arm/mach-davinci/board-omapl138-hawk.c @@ -157,7 +157,7 @@ static __init void omapl138_hawk_mmc_init(void) if (ret < 0) { pr_warning("%s: can not open GPIO %d\n", __func__, DA850_HAWK_MMCSD_CD_PIN); - return; + goto exp_setup_cd_fail; } ret = gpio_request_one(DA850_HAWK_MMCSD_WP_PIN, @@ -165,13 +165,23 @@ static __init void omapl138_hawk_mmc_init(void) if (ret < 0) { pr_warning("%s: can not open GPIO %d\n", __func__, DA850_HAWK_MMCSD_WP_PIN); - return; + goto exp_setup_wp_fail; } ret = da8xx_register_mmcsd0(&da850_mmc_config); - if (ret) + if (ret) { pr_warning("%s: MMC/SD0 registration failed: %d\n", __func__, ret); + goto exp_setup_mmcsd_fail; + } + return; + +exp_setup_mmcsd_fail: + gpio_free(DA850_HAWK_MMCSD_WP_PIN); +exp_setup_wp_fail: + gpio_free(DA850_HAWK_MMCSD_CD_PIN); +exp_setup_cd_fail: + return; } static irqreturn_t omapl138_hawk_usb_ocic_irq(int irq, void *dev_id); @@ -211,7 +221,7 @@ static int hawk_usb_ocic_notify(da8xx_ocic_handler_t handler) IRQF_TRIGGER_FALLING, "OHCI over-current indicator", NULL); if (error) - pr_err(KERN_ERR "%s: could not request IRQ to watch " + pr_err("%s: could not request IRQ to watch " "over-current indicator changes\n", __func__); } else {