From patchwork Fri Nov 6 07:22:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kenji Kaneshige X-Patchwork-Id: 58013 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA67Mw0q029286 for ; Fri, 6 Nov 2009 07:22:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752865AbZKFHWw (ORCPT ); Fri, 6 Nov 2009 02:22:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753018AbZKFHWw (ORCPT ); Fri, 6 Nov 2009 02:22:52 -0500 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:45283 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752865AbZKFHWv (ORCPT ); Fri, 6 Nov 2009 02:22:51 -0500 Received: from m4.gw.fujitsu.co.jp ([10.0.50.74]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id nA67Msi6004793 for (envelope-from kaneshige.kenji@jp.fujitsu.com); Fri, 6 Nov 2009 16:22:55 +0900 Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 6222245DE6E for ; Fri, 6 Nov 2009 16:22:54 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 33E0845DE4D for ; Fri, 6 Nov 2009 16:22:54 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 15905E18005 for ; Fri, 6 Nov 2009 16:22:54 +0900 (JST) Received: from m106.s.css.fujitsu.com (m106.s.css.fujitsu.com [10.249.87.106]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 81E0AE18003 for ; Fri, 6 Nov 2009 16:22:53 +0900 (JST) Received: from m106.css.fujitsu.com (m106 [127.0.0.1]) by m106.s.css.fujitsu.com (Postfix) with ESMTP id CEF5C5B89B9; Fri, 6 Nov 2009 16:22:51 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.100.137]) by m106.s.css.fujitsu.com (Postfix) with ESMTP id 4A6E65B89DF; Fri, 6 Nov 2009 16:22:51 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Received: from KANE-LIFEBOOK[10.124.100.137] by KANE-LIFEBOOK (FujitsuOutboundMailChecker v1.3.1/9992[10.124.100.137]); Fri, 06 Nov 2009 16:22:47 +0900 (JST) Message-ID: <4AF3CEC4.2000209@jp.fujitsu.com> Date: Fri, 06 Nov 2009 16:22:44 +0900 From: Kenji Kaneshige User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) MIME-Version: 1.0 To: jbarnes@virtuousgeek.org, linux-pci@vger.kernel.org Subject: [BUG][PATCH] PCI ASPM: fix oops on root port removal Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Index: 20091105/drivers/pci/pcie/aspm.c =================================================================== --- 20091105.orig/drivers/pci/pcie/aspm.c +++ 20091105/drivers/pci/pcie/aspm.c @@ -656,8 +656,10 @@ void pcie_aspm_exit_link_state(struct pc free_link_state(link); /* Recheck latencies and configure upstream links */ - pcie_update_aspm_capable(root); - pcie_config_aspm_path(parent_link); + if (parent_link) { + pcie_update_aspm_capable(root); + pcie_config_aspm_path(parent_link); + } out: mutex_unlock(&aspm_lock); up_read(&pci_bus_sem);