Patchwork pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()

login
register
mail settings
Submitter Bartlomiej Zolnierkiewicz
Date July 30, 2009, 9:19 p.m.
Message ID <200907302319.18150.bzolnier@gmail.com>
Download mbox | patch
Permalink /patch/30399/
State Accepted
Headers show

Comments

Bartlomiej Zolnierkiewicz - July 30, 2009, 9:19 p.m.
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()

Move the debug printk() into the proper place and remove superfluous
NULL pointer check in pcnet32_probe1().

This takes care of the following entry from Dan's list:

drivers/net/pcnet32.c +1889 pcnet32_probe1(298) warning: variable derefenced before check 'pdev'

Reported-by: Dan Carpenter <error27@gmail.com>
Cc: corbet@lwn.net
Cc: eteo@redhat.com
Cc: Julia Lawall <julia@diku.dk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/net/pcnet32.c |   18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 2, 2009, 7:30 p.m.
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 30 Jul 2009 23:19:17 +0200

> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Subject: [PATCH] pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()
> 
> Move the debug printk() into the proper place and remove superfluous
> NULL pointer check in pcnet32_probe1().
> 
> This takes care of the following entry from Dan's list:
> 
> drivers/net/pcnet32.c +1889 pcnet32_probe1(298) warning: variable derefenced before check 'pdev'
> 
> Reported-by: Dan Carpenter <error27@gmail.com>
> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Applied, but please CC: netdev@vger.kernel.org for all future
network driver patches so that it gets properly tracked in
patchwork.  Thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bartlomiej Zolnierkiewicz - Aug. 2, 2009, 8:07 p.m.
On Sunday 02 August 2009 21:30:22 David Miller wrote:
> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Date: Thu, 30 Jul 2009 23:19:17 +0200
> 
> > From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> > Subject: [PATCH] pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()
> > 
> > Move the debug printk() into the proper place and remove superfluous
> > NULL pointer check in pcnet32_probe1().
> > 
> > This takes care of the following entry from Dan's list:
> > 
> > drivers/net/pcnet32.c +1889 pcnet32_probe1(298) warning: variable derefenced before check 'pdev'
> > 
> > Reported-by: Dan Carpenter <error27@gmail.com>
> > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> 
> Applied, but please CC: netdev@vger.kernel.org for all future
> network driver patches so that it gets properly tracked in
> patchwork.  Thanks!

netdev@vger.kernel.org was on cc: for all patches...

http://marc.info/?l=linux-netdev&m=124898901714229&w=2
http://marc.info/?l=linux-netdev&m=124898901714236&w=2

maybe there is some problem with a patchwork setup..
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 2, 2009, 8:12 p.m.
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Sun, 2 Aug 2009 22:07:29 +0200

> netdev@vger.kernel.org was on cc: for all patches...
> 
> http://marc.info/?l=linux-netdev&m=124898901714229&w=2
> http://marc.info/?l=linux-netdev&m=124898901714236&w=2
> 
> maybe there is some problem with a patchwork setup..

My bad, I misread the CC: list, sorry.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Bartlomiej Zolnierkiewicz - Aug. 4, 2009, 10:32 a.m.
On Sunday 02 August 2009 22:12:56 David Miller wrote:
> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
> Date: Sun, 2 Aug 2009 22:07:29 +0200
> 
> > netdev@vger.kernel.org was on cc: for all patches...
> > 
> > http://marc.info/?l=linux-netdev&m=124898901714229&w=2
> > http://marc.info/?l=linux-netdev&m=124898901714236&w=2
> > 
> > maybe there is some problem with a patchwork setup..
> 
> My bad, I misread the CC: list, sorry.

There still may be some netdev patchwork problem..

These patches were applied with Don as an author:

commit 63097b3ad85788a64c75091bff351ecc850761b2
Author: Don Fry <pcnet32@verizon.net>
Date:   Fri Jul 31 08:45:29 2009 +0000

    pcnet32: VLB support fixes

...

commit df4e7f72f5156ef16a918da8a575ba90ec27ab77
Author: Don Fry <pcnet32@verizon.net>
Date:   Fri Jul 31 08:40:06 2009 +0000

    pcnet32: remove superfluous NULL pointer check in pcnet32_probe1()

...
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Aug. 4, 2009, 1:03 p.m.
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Tue, 4 Aug 2009 12:32:56 +0200

> On Sunday 02 August 2009 22:12:56 David Miller wrote:
>> From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
>> Date: Sun, 2 Aug 2009 22:07:29 +0200
>> 
>> > netdev@vger.kernel.org was on cc: for all patches...
>> > 
>> > http://marc.info/?l=linux-netdev&m=124898901714229&w=2
>> > http://marc.info/?l=linux-netdev&m=124898901714236&w=2
>> > 
>> > maybe there is some problem with a patchwork setup..
>> 
>> My bad, I misread the CC: list, sorry.
> 
> There still may be some netdev patchwork problem..
> 
> These patches were applied with Don as an author:

It's because he forwarded them to netdev when he ACK'd them, and those
are the ones the postings that actually showed up properly in
patchwork, and thus the From: lines that got used for authorship.

Sorry, I should have caught that.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: b/drivers/net/pcnet32.c
===================================================================
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1611,8 +1611,11 @@  pcnet32_probe1(unsigned long ioaddr, int
 		if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
 		    && pcnet32_dwio_check(ioaddr)) {
 			a = &pcnet32_dwio;
-		} else
+		} else {
+			if (pcnet32_debug & NETIF_MSG_PROBE)
+				printk(KERN_ERR PFX "No access methods\n");
 			goto err_release_region;
+		}
 	}
 
 	chip_version =
@@ -1853,12 +1856,6 @@  pcnet32_probe1(unsigned long ioaddr, int
 	    ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
 		lp->options |= PCNET32_PORT_FD;
 
-	if (!a) {
-		if (pcnet32_debug & NETIF_MSG_PROBE)
-			printk(KERN_ERR PFX "No access methods\n");
-		ret = -ENODEV;
-		goto err_free_consistent;
-	}
 	lp->a = *a;
 
 	/* prior to register_netdev, dev->name is not yet correct */
@@ -1974,14 +1971,13 @@  pcnet32_probe1(unsigned long ioaddr, int
 
 	return 0;
 
-      err_free_ring:
+err_free_ring:
 	pcnet32_free_ring(dev);
-      err_free_consistent:
 	pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
 			    lp->init_block, lp->init_dma_addr);
-      err_free_netdev:
+err_free_netdev:
 	free_netdev(dev);
-      err_release_region:
+err_release_region:
 	release_region(ioaddr, PCNET32_TOTAL_SIZE);
 	return ret;
 }