| Message ID | 1234722621-14498-4-git-send-email-corentincj@iksaif.net (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
applied -- Len Brown, Intel Open Source Technology Center On Sun, 15 Feb 2009, Corentin Chary wrote: > Restore acpi_generate_proc_event() for backward > compatibility with old acpi scripts. > > Signed-off-by: Corentin Chary <corentincj@iksaif.net> > --- > drivers/platform/x86/eeepc-laptop.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c > index 786ed86..6f54fd1 100644 > --- a/drivers/platform/x86/eeepc-laptop.c > +++ b/drivers/platform/x86/eeepc-laptop.c > @@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data) > static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data) > { > static struct key_entry *key; > + u16 count; > + > if (!ehotk) > return; > if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX) > notify_brn(); > + count = ehotk->event_count[event % 128]++; > + acpi_bus_generate_proc_event(ehotk->device, event, count); > acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class, > dev_name(&ehotk->device->dev), event, > - ehotk->event_count[event % 128]++); > + count); > if (ehotk->inputdev) { > key = eepc_get_entry_by_scancode(event); > if (key) { > -- > 1.6.1.2 > > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 786ed86..6f54fd1 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data) static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data) { static struct key_entry *key; + u16 count; + if (!ehotk) return; if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX) notify_brn(); + count = ehotk->event_count[event % 128]++; + acpi_bus_generate_proc_event(ehotk->device, event, count); acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class, dev_name(&ehotk->device->dev), event, - ehotk->event_count[event % 128]++); + count); if (ehotk->inputdev) { key = eepc_get_entry_by_scancode(event); if (key) {
Restore acpi_generate_proc_event() for backward compatibility with old acpi scripts. Signed-off-by: Corentin Chary <corentincj@iksaif.net> --- drivers/platform/x86/eeepc-laptop.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)