From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755428Ab0BFKXN (ORCPT ); Sat, 6 Feb 2010 05:23:13 -0500 Received: from elvis.franken.de ([193.175.24.41]:35778 "EHLO elvis.franken.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754138Ab0BFKXM (ORCPT ); Sat, 6 Feb 2010 05:23:12 -0500 X-Greylist: delayed 1839 seconds by postgrey-1.27 at vger.kernel.org; Sat, 06 Feb 2010 05:23:12 EST Date: Sat, 6 Feb 2010 10:52:18 +0100 From: Thomas Bogendoerfer To: Julia Lawall Cc: Ralf Baechle , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH 2/11] arch/mips/sni: Correct NULL test Message-ID: <20100206095218.GA7185@alpha.franken.de> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Feb 06, 2010 at 09:42:16AM +0100, Julia Lawall wrote: > From: Julia Lawall > > Test the value that was just allocated rather than the previously tested one. > > A simplified version of the semantic match that finds this problem is as > follows: (http://coccinelle.lip6.fr/) > > // > @r@ > expression *x; > expression e; > identifier l; > @@ > > if (x == NULL || ...) { > ... when forall > return ...; } > ... when != goto l; > when != x = e > when != &x > *x == NULL > // > > Signed-off-by: Julia Lawall > send > --- > arch/mips/sni/rm200.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c > index 46f0069..31e2583 100644 > --- a/arch/mips/sni/rm200.c > +++ b/arch/mips/sni/rm200.c > @@ -404,7 +404,7 @@ void __init sni_rm200_i8259_irqs(void) > if (!rm200_pic_master) > return; > rm200_pic_slave = ioremap_nocache(0x160000a0, 4); > - if (!rm200_pic_master) { > + if (!rm200_pic_slave) { > iounmap(rm200_pic_master); > return; > } Acked-by: Thomas Bogendoerfer Thanks for fixing. Thomas. -- Crap can work. Given enough thrust pigs will fly, but it's not necessary a good idea. [ RFC1925, 2.3 ]