From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932127Ab1HVKR4 (ORCPT ); Mon, 22 Aug 2011 06:17:56 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:57190 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752461Ab1HVKRo (ORCPT ); Mon, 22 Aug 2011 06:17:44 -0400 Message-ID: <4E522CA2.3030403@ti.com> Date: Mon, 22 Aug 2011 11:17:06 +0100 From: Liam Girdwood User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110617 Lightning/1.0b2 Thunderbird/3.1.11 MIME-Version: 1.0 To: Julia Lawall CC: "kernel-janitors@vger.kernel.org" , Mark Brown , Jaroslav Kysela , Takashi Iwai , Arnaud Patard , Greg Kroah-Hartman , "alsa-devel@alsa-project.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 1/4] sound/soc/kirkwood/kirkwood-i2s.c: add missing kfree References: <1313820761-12042-1-git-send-email-julia@diku.dk> In-Reply-To: <1313820761-12042-1-git-send-email-julia@diku.dk> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/08/11 07:12, Julia Lawall wrote: > From: Julia Lawall > > Adjust the goto to jump to the error handling code that includes kfree. > > A simplified version of the semantic match that finds this problem is as > follows: (http://coccinelle.lip6.fr/) > > // > @@ > identifier x; > expression E1!=0,E2,E3,E4; > statement S; > iterator I; > @@ > > ( > if (...) { ... when != kfree(x) > when != x = E3 > when != E3 = x > * return ...; > } > ... when != x = E2 > when != I(...,x,...) S > if (...) { ... when != x = E4 > kfree(x); ... return ...; } > ) > // > > Signed-off-by: Julia Lawall > > --- > sound/soc/kirkwood/kirkwood-i2s.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c > index a33fc51..8f16cd3 100644 > --- a/sound/soc/kirkwood/kirkwood-i2s.c > +++ b/sound/soc/kirkwood/kirkwood-i2s.c > @@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev) > if (!priv->mem) { > dev_err(&pdev->dev, "request_mem_region failed\n"); > err = -EBUSY; > - goto error; > + goto error_alloc; > } > > priv->io = ioremap(priv->mem->start, SZ_16K); > All Acked-by: Liam Girdwood