From patchwork Tue Jul 27 10:05:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 59987 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2207CB70A5 for ; Tue, 27 Jul 2010 20:06:32 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756045Ab0G0KG0 (ORCPT ); Tue, 27 Jul 2010 06:06:26 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:43603 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756032Ab0G0KGZ (ORCPT ); Tue, 27 Jul 2010 06:06:25 -0400 Received: by fxm14 with SMTP id 14so507944fxm.19 for ; Tue, 27 Jul 2010 03:06:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=Q2pVMH+fBbEzs91WzFQ2hJcmoXUyfLMYv4pwRWJ5+NE=; b=BCoaFhiPrYzfP6/KvWKvLpu56an0tVQrIVbCpfYWxDuG/XQDVC7wk/KmKCSXIV3GKj iE/iLItADMmBjO6eCXv5dO2mgHLc/6kSA9QZed6Wl9AyCLCf/XGmys1IAaiJjte5EzOf oDSJsnuj+m0tEhCfMWYlvThRTXgm2jxMPohps= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=lGl7r7SXKjLHDGRaLBmelTt03j65hChpiejFGrBDChKfxac6HX5hXfEMpRgPvIfRUu nCtrGmhvUTLqbTWLd/hXDSG5wBLHXtF4KOquNcFCHaFjgYgvNd/DFmBpBNfRaGqoiM6g SFrZ2xUy1VZpnZkuYl1jHFjPfauCgQSIFbhuk= Received: by 10.223.116.197 with SMTP id n5mr7746229faq.53.1280225183678; Tue, 27 Jul 2010 03:06:23 -0700 (PDT) Received: from bicker ([205.177.176.130]) by mx.google.com with ESMTPS id y2sm1835687fau.12.2010.07.27.03.06.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 27 Jul 2010 03:06:22 -0700 (PDT) Date: Tue, 27 Jul 2010 12:05:56 +0200 From: Dan Carpenter To: Jeff Kirsher Cc: Jesse Brandeburg , Bruce Allan , Alex Duyck , PJ Waskiewicz , John Ronciak , "David S. Miller" , Don Skidmore , Mallikarjuna R Chilakala , e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [patch -next] ixgbe: potential null dereference Message-ID: <20100727100556.GM26313@bicker> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The e_dev_err() macro dereferences "adapter" which is NULL here. Signed-off-by: Dan Carpenter Acked-by: Jeff Kirsher --- 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 diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 9203759..0360260 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -6549,8 +6549,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); if (err) { - e_dev_err("No usable DMA configuration, " - "aborting\n"); + dev_err(&pdev->dev, + "No usable DMA configuration, aborting\n"); goto err_dma; } } @@ -6560,7 +6560,8 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, err = pci_request_selected_regions(pdev, pci_select_bars(pdev, IORESOURCE_MEM), ixgbe_driver_name); if (err) { - e_dev_err("pci_request_selected_regions failed 0x%x\n", err); + dev_err(&pdev->dev, + "pci_request_selected_regions failed 0x%x\n", err); goto err_pci_reg; }