| Message ID | 1234722621-14498-3-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/asus-laptop.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c > index 56af6cf..eeafc6c 100644 > --- a/drivers/platform/x86/asus-laptop.c > +++ b/drivers/platform/x86/asus-laptop.c > @@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode) > static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) > { > static struct key_entry *key; > + u16 count; > > /* TODO Find a better way to handle events count. */ > if (!hotk) > @@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) > lcd_blank(FB_BLANK_POWERDOWN); > } > > + count = hotk->event_count[event % 128]++; > + acpi_bus_generate_proc_event(hotk->device, event, count); > acpi_bus_generate_netlink_event(hotk->device->pnp.device_class, > dev_name(&hotk->device->dev), event, > - hotk->event_count[event % 128]++); > + count); > > if (hotk->inputdev) { > key = asus_get_entry_by_scancode(event); > -- > 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/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 56af6cf..eeafc6c 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c @@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode) static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) { static struct key_entry *key; + u16 count; /* TODO Find a better way to handle events count. */ if (!hotk) @@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) lcd_blank(FB_BLANK_POWERDOWN); } + count = hotk->event_count[event % 128]++; + acpi_bus_generate_proc_event(hotk->device, event, count); acpi_bus_generate_netlink_event(hotk->device->pnp.device_class, dev_name(&hotk->device->dev), event, - hotk->event_count[event % 128]++); + count); if (hotk->inputdev) { key = asus_get_entry_by_scancode(event);
Restore acpi_generate_proc_event() for backward compatibility with old acpi scripts. Signed-off-by: Corentin Chary <corentincj@iksaif.net> --- drivers/platform/x86/asus-laptop.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)