From fad86f16637026e0a345805c74ee1ad2c47e9580 Mon Sep 17 00:00:00 2001 From: Corentin Chary Date: Sat, 28 Nov 2009 10:35:37 +0100 Subject: [PATCH] --- yaml --- r: 185045 b: refs/heads/master c: 619d8b1187f2e13f6f848b1b2a4d83c2c9e2a140 h: refs/heads/master i: 185043: 1d70e7ac41797bb8daab987b5b030bea0cccc915 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/asus-laptop.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3029734af19f..0876bc0c8da5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91687cc89af4c447483ec65097809c38c8622639 +refs/heads/master: 619d8b1187f2e13f6f848b1b2a4d83c2c9e2a140 diff --git a/trunk/drivers/platform/x86/asus-laptop.c b/trunk/drivers/platform/x86/asus-laptop.c index 5889bda5a03b..74463a07d48b 100644 --- a/trunk/drivers/platform/x86/asus-laptop.c +++ b/trunk/drivers/platform/x86/asus-laptop.c @@ -941,10 +941,6 @@ static void asus_hotk_notify(struct acpi_device *device, u32 event) static struct key_entry *key; u16 count; - /* TODO Find a better way to handle events count. */ - if (!hotk) - return; - /* * We need to tell the backlight device when the backlight power is * switched @@ -957,6 +953,7 @@ static void asus_hotk_notify(struct acpi_device *device, u32 event) lcd_blank(FB_BLANK_POWERDOWN); } + /* TODO Find a better way to handle events count. */ 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,