Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756195AbZDSHU0 (ORCPT ); Sun, 19 Apr 2009 03:20:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752326AbZDSHUL (ORCPT ); Sun, 19 Apr 2009 03:20:11 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:55419 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751966AbZDSHUK (ORCPT ); Sun, 19 Apr 2009 03:20:10 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=Py4LxVXfcAHJf5gKa2c6y7g4dF1FCAl92Ksq4r6JX9kW9i8kgQc8EbxkMYxjPn2exA 2jtW0fJA6ZQu2yQt7y1T4JanuTJJnjRea/iO8NezXfNGGJ3SOLmv8WQNX1juZVQKhUaz S1P20H19Hj03zNFKVctqfKXB8dqgQjTVgtO4Y= MIME-Version: 1.0 In-Reply-To: <20090419015614.GA6926@srcf.ucam.org> References: <20090209234911.GB862@elte.hu> <5030E21460%linux@youmustbejoking.demon.co.uk> <20090210150431.GA26798@srcf.ucam.org> <5030E7CFF4%linux@youmustbejoking.demon.co.uk> <20090419015614.GA6926@srcf.ucam.org> Date: Sun, 19 Apr 2009 09:20:07 +0200 Message-ID: <71cd59b00904190020x7d946c29w736d89fc27d39594@mail.gmail.com> Subject: Re: [PATCH] eee-laptop: Register as a pci-hotplug device From: Corentin Chary To: Matthew Garrett Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Len Brown , Darren Salt Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1526 Lines: 42 > + result = eeepc_setup_pci_hotplug(); > + > + /* > + * If we get -EBUSY then something else is handling the PCI hotplug - > + * don't fail in this case > + */ > + > + if (result == -EBUSY) > + return 0; > + else if (result) > + goto pci_fail; > + > eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6"); > eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7"); > > - eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6"); > - eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7"); > + if (ehotk->hotplug_slot) { > + eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6"); > + eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7"); > + pci_hp_deregister(ehotk->hotplug_slot); > + } Hi, This patch conflict with http://git.iksaif.net/?p=acpi4asus.git;a=commitdiff;h=8082f39bb3d4a27c7bb03a76e72c70c86d55117b;hp=7ec0a7290797f57b780f792d12f4bcc19c83aa4f A quick fix is to do : eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6"); eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7"); if (ehotk->hotplug_slot) pci_hp_deregister(ehotk->hotplug_slot); but I'm not sure it's correct. I should have sent a series sooner to avoid that :/ Thanks -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/