[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <71cd59b00904190020x7d946c29w736d89fc27d39594@mail.gmail.com>
Date: Sun, 19 Apr 2009 09:20:07 +0200
From: Corentin Chary <corentin.chary@...il.com>
To: Matthew Garrett <mjg59@...f.ucam.org>
Cc: linux-kernel@...r.kernel.org, linux-acpi@...r.kernel.org,
Len Brown <lenb@...nel.org>,
Darren Salt <linux@...mustbejoking.demon.co.uk>
Subject: Re: [PATCH] eee-laptop: Register as a pci-hotplug device
> + 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists