From patchwork Fri May 22 14:35:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: grygorii.strashko@linaro.org X-Patchwork-Id: 475619 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DEF57140E44 for ; Sat, 23 May 2015 00:36:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757253AbbEVOgK (ORCPT ); Fri, 22 May 2015 10:36:10 -0400 Received: from mail-lb0-f181.google.com ([209.85.217.181]:34200 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757233AbbEVOgI (ORCPT ); Fri, 22 May 2015 10:36:08 -0400 Received: by lbcmx3 with SMTP id mx3so14321270lbc.1 for ; Fri, 22 May 2015 07:36:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yCC4vExyPQVq3QVBAbrAEDNAbskYdCn+Jguh5xdbDeQ=; b=JwV0iR1DBwkMeMWT/V/ZZbMLN3WWaEDhS+gyIVHid0uYfwtWeMa/VWFkGSZywpNB5x /UpFqwmaUcHViFLaYk1a2wNnX1IHxt5193+cXFaG9KrCZmMdxRXD9dvk7D95ZhyTOonI GitlT419vqe6ZnJ6b0phptu+EggpOg6A+OyNXf6qRNFM6WQBNZU5qkfQfkoHgsQTFNrT VKAlC67VR75sBomZI3F474YQFHtJD7iYlyUKV8nt62uxH4dfytkBj8YpWD2oXvkMrIQH 4ruuW8CTpy+Oi0NlMOYsejq1H2O0mKfRUpsRBXiC2cxma0XoE6g2CZ/C+iKPmjbjpDCQ eVeA== X-Gm-Message-State: ALoCoQnKcw7q0+mGBJPYhi18VOqFpTEfs6QG7mWhbBf1QnlaZvJolaNXffcaF7WxsSqR5mEKbAbL X-Received: by 10.112.161.197 with SMTP id xu5mr6587456lbb.69.1432305366152; Fri, 22 May 2015 07:36:06 -0700 (PDT) Received: from localhost ([195.238.92.128]) by mx.google.com with ESMTPSA id oy3sm535594lbb.1.2015.05.22.07.36.05 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 22 May 2015 07:36:05 -0700 (PDT) From: Grygorii Strashko To: Linus Walleij , Alexandre Courbot , tony@atomide.com Cc: Javier Martinez Canillas , ssantosh@kernel.org, Kevin Hilman , linux-omap@vger.kernel.org, linux-gpio@vger.kernel.org, Grygorii Strashko Subject: [PATCH 2/7] gpio: omap: fix error handling in omap_gpio_irq_type Date: Fri, 22 May 2015 17:35:49 +0300 Message-Id: <1432305354-5968-3-git-send-email-grygorii.strashko@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1432305354-5968-1-git-send-email-grygorii.strashko@linaro.org> References: <1432305354-5968-1-git-send-email-grygorii.strashko@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The GPIO bank will be kept powered in case if input parameters are invalid or error occurred in omap_gpio_irq_type. Hence, fix it by ensuring that GPIO bank will be unpowered in case of errors and add additional check of value returned from omap_set_gpio_triggering(). Signed-off-by: Grygorii Strashko Acked-by: Javier Martinez Canillas --- drivers/gpio/gpio-omap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index bb60cbc..f6cc638 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -488,9 +488,6 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) unsigned long flags; unsigned offset = d->hwirq; - if (!BANK_USED(bank)) - pm_runtime_get_sync(bank->dev); - if (type & ~IRQ_TYPE_SENSE_MASK) return -EINVAL; @@ -498,12 +495,18 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) (type & (IRQ_TYPE_LEVEL_LOW|IRQ_TYPE_LEVEL_HIGH))) return -EINVAL; + if (!BANK_USED(bank)) + pm_runtime_get_sync(bank->dev); + spin_lock_irqsave(&bank->lock, flags); retval = omap_set_gpio_triggering(bank, offset, type); + if (retval) + goto error; omap_gpio_init_irq(bank, offset); if (!omap_gpio_is_input(bank, offset)) { spin_unlock_irqrestore(&bank->lock, flags); - return -EINVAL; + retval = -EINVAL; + goto error; } spin_unlock_irqrestore(&bank->lock, flags); @@ -512,6 +515,11 @@ static int omap_gpio_irq_type(struct irq_data *d, unsigned type) else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING)) __irq_set_handler_locked(d->irq, handle_edge_irq); + return 0; + +error: + if (!BANK_USED(bank)) + pm_runtime_put(bank->dev); return retval; }