From patchwork Fri Jul 31 18:40:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Fry X-Patchwork-Id: 30433 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 7B73DB7BB1 for ; Sat, 1 Aug 2009 04:40:35 +1000 (EST) Received: by ozlabs.org (Postfix) id 69439DDDA2; Sat, 1 Aug 2009 04:40:35 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id E581EDDDA0 for ; Sat, 1 Aug 2009 04:40:34 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752844AbZGaSkJ (ORCPT ); Fri, 31 Jul 2009 14:40:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752805AbZGaSkJ (ORCPT ); Fri, 31 Jul 2009 14:40:09 -0400 Received: from vms173003pub.verizon.net ([206.46.173.3]:39061 "EHLO vms173003pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752793AbZGaSkH (ORCPT ); Fri, 31 Jul 2009 14:40:07 -0400 Received: from [192.168.1.3] ([96.253.170.133]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 6.3-7.04 (built Sep 26 2008; 32bit)) with ESMTPA id <0KNN0042OT6VW4A1@vms173003.mailsrvcs.net>; Fri, 31 Jul 2009 13:40:08 -0500 (CDT) Subject: Re: [PATCH] pcnet32: remove superfluous NULL pointer check in pcnet32_probe1() From: Don Fry To: Bartlomiej Zolnierkiewicz Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter , corbet@lwn.net, eteo@redhat.com, Julia Lawall In-reply-to: <200907302319.18150.bzolnier@gmail.com> References: <200907302319.18150.bzolnier@gmail.com> Content-type: text/plain Date: Fri, 31 Jul 2009 11:40:06 -0700 Message-id: <1249065606.4229.1.camel@localhost.localdomain> MIME-version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-2.fc10) Content-transfer-encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Acked-by: Don Fry -----Original Message----- From: Bartlomiej Zolnierkiewicz To: Don Fry Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Carpenter , corbet@lwn.net, eteo@redhat.com, Julia Lawall Subject: [PATCH] pcnet32: remove superfluous NULL pointer check in pcnet32_probe1() Date: Thu, 30 Jul 2009 23:19:17 +0200 From: Bartlomiej Zolnierkiewicz 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 Cc: corbet@lwn.net Cc: eteo@redhat.com Cc: Julia Lawall Signed-off-by: Bartlomiej Zolnierkiewicz --- 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 -- 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 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; }