From patchwork Tue Aug 3 15:43:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 60774 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 03CA3B6EFE for ; Wed, 4 Aug 2010 01:44:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932205Ab0HCPnZ (ORCPT ); Tue, 3 Aug 2010 11:43:25 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:46162 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932228Ab0HCPnX (ORCPT ); Tue, 3 Aug 2010 11:43:23 -0400 Received: by mail-ew0-f46.google.com with SMTP id 23so1690906ewy.19 for ; Tue, 03 Aug 2010 08:43:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=FkSaLGZvNNmJEx4fF8tQUA9Nc6ia6raAgEg/SbXoA+U=; b=TA62eZAvlcQnbswLwoooElaMl80G0y9V9peFtrsoFAWeogsAYHFyxqDm87LundD4bz 5FXuUx0rZrw317PNpE6ekmy0jasEsHf74XmmBcVNKrsRe2Id0o2l9lUXB3lD4EicrMcz mn+to+kBF6iRh6cFHyn1VQHcOgMiqRxQBHUfA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=dM+Z24Pjq/7/Wx+Of/u3si4+m+jriMj4NY0C/mKkJtMNtfb7j77E3iuJHmuhpT+Wk1 d6Dioy/kV73Tyig6ZvnNFHXIRKO4CGD4MAWoE5kZVyhAx34NKGiPRLpGIuXv2oEuVw/9 AzM7rYJwsI30DqkuOMT/7UQzERAvUj7yJYZuQ= Received: by 10.213.15.135 with SMTP id k7mr5695139eba.56.1280850202648; Tue, 03 Aug 2010 08:43:22 -0700 (PDT) Received: from localhost (ppp91-78-208-178.pppoe.mtu-net.ru [91.78.208.178]) by mx.google.com with ESMTPS id u9sm5006246eeh.5.2010.08.03.08.43.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 03 Aug 2010 08:43:22 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Francois Romieu , "David S. Miller" , Simon Kagstrom , Ben Hutchings , Jiri Pirko , Eric Dumazet , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] via-velocity: do not use PCI resources before pci_enable_device() Date: Tue, 3 Aug 2010 19:43:18 +0400 Message-Id: <1280850199-5488-1-git-send-email-segooon@gmail.com> X-Mailer: git-send-email 1.7.0.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org IRQ and resource[] may not have correct values until after PCI hotplug setup occurs at pci_enable_device() time. The semantic match that finds this problem is as follows: // @@ identifier x; identifier request ~= "pci_request.*|pci_resource.*"; @@ ( * x->irq | * x->resource | * request(x, ...) ) ... *pci_enable_device(x) // Signed-off-by: Kulikov Vasiliy --- drivers/net/via-velocity.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 42dffd3..fd69095 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -2763,12 +2763,12 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi vptr->dev = dev; - dev->irq = pdev->irq; - ret = pci_enable_device(pdev); if (ret < 0) goto err_free_dev; + dev->irq = pdev->irq; + ret = velocity_get_pci_info(vptr, pdev); if (ret < 0) { /* error message already printed */