From patchwork Sat Dec 18 12:29:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 417961 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBICV18o022580 for ; Sat, 18 Dec 2010 12:31:02 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755917Ab0LRMat (ORCPT ); Sat, 18 Dec 2010 07:30:49 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:37287 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755902Ab0LRMas (ORCPT ); Sat, 18 Dec 2010 07:30:48 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 781091A0232; Sat, 18 Dec 2010 13:25:54 +0100 (CET) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 08625-01; Sat, 18 Dec 2010 13:25:32 +0100 (CET) Received: from ferrari.rjw.lan (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 4283719FE98; Sat, 18 Dec 2010 13:25:32 +0100 (CET) From: "Rafael J. Wysocki" To: Jesse Barnes Subject: [Resend][PATCH] PCI / Hotplug: Fix unexpected driver unregister in pciehp_acpi.c Date: Sat, 18 Dec 2010 13:29:45 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37-rc6+; KDE/4.4.4; x86_64; ; ) Cc: LKML , linux-pci@vger.kernel.org, ACPI Devel Maling List , Matthew Garrett MIME-Version: 1.0 Message-Id: <201012181329.46071.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 18 Dec 2010 12:31:02 +0000 (UTC) Index: linux-2.6/drivers/pci/hotplug/pciehp_acpi.c =================================================================== --- linux-2.6.orig/drivers/pci/hotplug/pciehp_acpi.c +++ linux-2.6/drivers/pci/hotplug/pciehp_acpi.c @@ -115,7 +115,8 @@ static struct pcie_port_service_driver _ static int __init select_detection_mode(void) { struct dummy_slot *slot, *tmp; - pcie_port_service_register(&dummy_driver); + if (pcie_port_service_register(&dummy_driver)) + return PCIEHP_DETECT_ACPI; pcie_port_service_unregister(&dummy_driver); list_for_each_entry_safe(slot, tmp, &dummy_slots, list) { list_del(&slot->list);