---

yaml --- r: 185045 b: refs/heads/master c: 619d8b1 h: refs/heads/master i: 185043: 1d70e7a v: v3
git-mirror · Feb 28, 2010 · fad86f1 · fad86f1
1 parent 633b90a
commit fad86f1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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,