From patchwork Mon Jan 4 23:58:43 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yinghai Lu X-Patchwork-Id: 70783 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o04NxlFW002884 for ; Mon, 4 Jan 2010 23:59:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752983Ab0ADX7q (ORCPT ); Mon, 4 Jan 2010 18:59:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753280Ab0ADX7q (ORCPT ); Mon, 4 Jan 2010 18:59:46 -0500 Received: from hera.kernel.org ([140.211.167.34]:39628 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752983Ab0ADX7p (ORCPT ); Mon, 4 Jan 2010 18:59:45 -0500 Received: from [10.6.76.26] (sca-ea-fw-1.Sun.COM [192.18.43.225]) (authenticated bits=0) by hera.kernel.org (8.14.3/8.14.3) with ESMTP id o04NxiTV032264 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Mon, 4 Jan 2010 23:59:44 GMT Message-ID: <4B4280B3.7040001@kernel.org> Date: Mon, 04 Jan 2010 15:58:43 -0800 From: Yinghai Lu User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.5) Gecko/20091130 SUSE/3.0.0-1.1.1 Thunderbird/3.0 MIME-Version: 1.0 To: Jesse Barnes , Matthew Wilcox CC: "linux-pci@vger.kernel.org" Subject: [PATCH] pci: fix next_ari_fn scan Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Index: linux-2.6/drivers/pci/probe.c =================================================================== --- linux-2.6.orig/drivers/pci/probe.c +++ linux-2.6/drivers/pci/probe.c @@ -1234,7 +1234,11 @@ EXPORT_SYMBOL(pci_scan_single_device); static unsigned next_ari_fn(struct pci_dev *dev, unsigned fn) { u16 cap; - unsigned pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI); + unsigned pos; + + if (!dev) + return 0; + pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI); if (!pos) return 0; pci_read_config_word(dev, pos + 4, &cap);