From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Creasey Date: Tue, 14 Oct 2008 16:40:43 +0000 Subject: Re: [PATCH 2/2] drivers/scsi/sun3x_esp.c: Convert && to || Message-Id: <20081014164043.GS10918@sammy.net> List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Julia Lawall Cc: James.Bottomley@HansenPartnership.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org On Tue, Oct 14, 2008 at 06:00:19PM +0200, Julia Lawall wrote: > From: Julia Lawall > > The pattern !E && !E->fld is nonsensical. The patch below updates this > according to the assumption that && should be ||. But perhaps another > solution was intended. > > The semantic patch that makes this change is as follows: > (http://www.emn.fr/x-info/coccinelle/) > > // > @disable and_comm@ > expression E; > identifier fld; > @@ > > - !E && !E->fld > + !E || !E->fld > // > > Signed-off-by: Julia Lawall Acked-By: Sam Creasey I doubt this code would have been likely to execute, but you're certainly right. It's a bug, and this looks like the fix. -- Sam > > --- > drivers/scsi/sun3x_esp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff -u -p a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c > --- a/drivers/scsi/sun3x_esp.c > +++ b/drivers/scsi/sun3x_esp.c > @@ -213,7 +213,7 @@ static int __devinit esp_sun3x_probe(str > esp->ops = &sun3x_esp_ops; > > res = platform_get_resource(dev, IORESOURCE_MEM, 0); > - if (!res && !res->start) > + if (!res || !res->start) > goto fail_unlink; > > esp->regs = ioremap_nocache(res->start, 0x20); > @@ -221,7 +221,7 @@ static int __devinit esp_sun3x_probe(str > goto fail_unmap_regs; > > res = platform_get_resource(dev, IORESOURCE_MEM, 1); > - if (!res && !res->start) > + if (!res || !res->start) > goto fail_unmap_regs; > > esp->dma_regs = ioremap_nocache(res->start, 0x10); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Creasey Subject: Re: [PATCH 2/2] drivers/scsi/sun3x_esp.c: Convert && to || Date: Tue, 14 Oct 2008 12:40:43 -0400 Message-ID: <20081014164043.GS10918@sammy.net> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from anhedonia.sammy.net ([72.46.127.32]:58530 "EHLO anhedonia.sammy.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750891AbYJNQks (ORCPT ); Tue, 14 Oct 2008 12:40:48 -0400 Content-Disposition: inline In-Reply-To: Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Julia Lawall Cc: James.Bottomley@HansenPartnership.com, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org On Tue, Oct 14, 2008 at 06:00:19PM +0200, Julia Lawall wrote: > From: Julia Lawall > > The pattern !E && !E->fld is nonsensical. The patch below updates this > according to the assumption that && should be ||. But perhaps another > solution was intended. > > The semantic patch that makes this change is as follows: > (http://www.emn.fr/x-info/coccinelle/) > > // > @disable and_comm@ > expression E; > identifier fld; > @@ > > - !E && !E->fld > + !E || !E->fld > // > > Signed-off-by: Julia Lawall Acked-By: Sam Creasey I doubt this code would have been likely to execute, but you're certainly right. It's a bug, and this looks like the fix. -- Sam > > --- > drivers/scsi/sun3x_esp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff -u -p a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c > --- a/drivers/scsi/sun3x_esp.c > +++ b/drivers/scsi/sun3x_esp.c > @@ -213,7 +213,7 @@ static int __devinit esp_sun3x_probe(str > esp->ops = &sun3x_esp_ops; > > res = platform_get_resource(dev, IORESOURCE_MEM, 0); > - if (!res && !res->start) > + if (!res || !res->start) > goto fail_unlink; > > esp->regs = ioremap_nocache(res->start, 0x20); > @@ -221,7 +221,7 @@ static int __devinit esp_sun3x_probe(str > goto fail_unmap_regs; > > res = platform_get_resource(dev, IORESOURCE_MEM, 1); > - if (!res && !res->start) > + if (!res || !res->start) > goto fail_unmap_regs; > > esp->dma_regs = ioremap_nocache(res->start, 0x10);