lkml.org 
[lkml]   [2009]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH] eee-laptop: Register as a pci-hotplug device
From
> +       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


\
 
 \ /
  Last update: 2009-04-19 09:23    [from the cache]
©2003-2014 Jasper Spaans. Advertise on this site