From mboxrd@z Thu Jan 1 00:00:00 1970 From: Samuel Ortiz Date: Mon, 27 Sep 2010 10:01:42 +0000 Subject: Re: [PATCH] gpio: stmpe: fix error path Message-Id: <20100927100141.GC2560@sortiz-mobl> List-Id: References: <1284317840-5131-1-git-send-email-segooon@gmail.com> In-Reply-To: <1284317840-5131-1-git-send-email-segooon@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Vasiliy Kulikov Cc: kernel-janitors@vger.kernel.org, Rabin Vincent , Wolfram Sang , Luotao Fu , Linus Walleij , linux-kernel@vger.kernel.org Hi Vasiliy, On Sun, Sep 12, 2010 at 10:57:19PM +0400, Vasiliy Kulikov wrote: > Free allocated memory. Call stmpe_disable() if it was enabled. Patch applied, thanks. > Signed-off-by: Vasiliy Kulikov > --- > Compile tested. > Maybe It needs better error path. > > drivers/gpio/stmpe-gpio.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpio/stmpe-gpio.c b/drivers/gpio/stmpe-gpio.c > index 65b9960..6e28afa 100644 > --- a/drivers/gpio/stmpe-gpio.c > +++ b/drivers/gpio/stmpe-gpio.c > @@ -317,11 +317,11 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev) > > ret = stmpe_enable(stmpe, STMPE_BLOCK_GPIO); > if (ret) > - return ret; > + goto out_free; > > ret = stmpe_gpio_irq_init(stmpe_gpio); > if (ret) > - goto out_free; > + goto out_disable; > > ret = request_threaded_irq(irq, NULL, stmpe_gpio_irq, IRQF_ONESHOT, > "stmpe-gpio", stmpe_gpio); > @@ -347,6 +347,8 @@ out_freeirq: > free_irq(irq, stmpe_gpio); > out_removeirq: > stmpe_gpio_irq_remove(stmpe_gpio); > +out_disable: > + stmpe_disable(stmpe, STMPE_BLOCK_GPIO); > out_free: > kfree(stmpe_gpio); > return ret; > -- > 1.7.0.4 > -- Intel Open Source Technology Centre http://oss.intel.com/