From patchwork Tue Aug 3 15:43:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kulikov Vasiliy X-Patchwork-Id: 60775 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 F0BC2B70A8 for ; Wed, 4 Aug 2010 01:44:15 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932262Ab0HCPng (ORCPT ); Tue, 3 Aug 2010 11:43:36 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:56537 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932212Ab0HCPnd (ORCPT ); Tue, 3 Aug 2010 11:43:33 -0400 Received: by mail-ey0-f174.google.com with SMTP id 25so1670184eya.19 for ; Tue, 03 Aug 2010 08:43:32 -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=tBF5pWE7gNmtMe/Oi3fDjJv2ODCd1A6fb4ZmuAX2wHQ=; b=MyBokvPOgaDJZobwtjJh+67nIhhYjnNHUtWDDgKsEt4fWl0ToqL1vQhwFMsp4+Yoir aPIu5C6cCEjlqZnhy2U1R69C4HYiqLNjkAh0bJ2NsImNyTNpXIgIYCmfP8sBl17t7XrH YT4VLndz/eF9GA2DlTPlp7Vu+jL2QvyM9Lik4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=J/7wAxbwwyi8VgmbUx+sgx6Y/JWiszkPnMEbEqbmCnJKh+ehbsZkyDeR3dxb5TsERA lbO9VQjvXkZFYDDdxyDBOY0C1XjkVxwxs1jipcpuBd8JpCILkkWmP5mQLt1SM7Da+HXl uqWIewxDTvMBCKjgFIB4FqFP+2TtA3zyn5l10= Received: by 10.213.35.18 with SMTP id n18mr1025751ebd.85.1280850211995; Tue, 03 Aug 2010 08:43:31 -0700 (PDT) Received: from localhost (ppp91-78-208-178.pppoe.mtu-net.ru [91.78.208.178]) by mx.google.com with ESMTPS id a48sm10981693eei.6.2010.08.03.08.43.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 03 Aug 2010 08:43:31 -0700 (PDT) From: Kulikov Vasiliy To: kernel-janitors@vger.kernel.org Cc: Ivo van Doorn , Gertjan van Wingerde , "John W. Linville" , Helmut Schaa , Alban Browaeys , linux-wireless@vger.kernel.org, users@rt2x00.serialmonkey.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] rt2x00: do not use PCI resources before pci_enable_device() Date: Tue, 3 Aug 2010 19:43:22 +0400 Message-Id: <1280850203-5532-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 Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2x00pci.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 19b262e..63c2cc4 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c @@ -240,16 +240,16 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) struct rt2x00_dev *rt2x00dev; int retval; - retval = pci_request_regions(pci_dev, pci_name(pci_dev)); + retval = pci_enable_device(pci_dev); if (retval) { - ERROR_PROBE("PCI request regions failed.\n"); + ERROR_PROBE("Enable device failed.\n"); return retval; } - retval = pci_enable_device(pci_dev); + retval = pci_request_regions(pci_dev, pci_name(pci_dev)); if (retval) { - ERROR_PROBE("Enable device failed.\n"); - goto exit_release_regions; + ERROR_PROBE("PCI request regions failed.\n"); + goto exit_disable_device; } pci_set_master(pci_dev); @@ -260,14 +260,14 @@ int rt2x00pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) { ERROR_PROBE("PCI DMA not supported.\n"); retval = -EIO; - goto exit_disable_device; + goto exit_release_regions; } hw = ieee80211_alloc_hw(sizeof(struct rt2x00_dev), ops->hw); if (!hw) { ERROR_PROBE("Failed to allocate hardware.\n"); retval = -ENOMEM; - goto exit_disable_device; + goto exit_release_regions; } pci_set_drvdata(pci_dev, hw); @@ -300,13 +300,12 @@ exit_free_reg: exit_free_device: ieee80211_free_hw(hw); -exit_disable_device: - if (retval != -EBUSY) - pci_disable_device(pci_dev); - exit_release_regions: pci_release_regions(pci_dev); +exit_disable_device: + pci_disable_device(pci_dev); + pci_set_drvdata(pci_dev, NULL); return retval;