From d857e6796fa54f7166b2a2360cbbc147b751473a Mon Sep 17 00:00:00 2001 From: Anisse Astier Date: Thu, 10 Dec 2009 14:18:18 +0100 Subject: [PATCH] --- yaml --- r: 177587 b: refs/heads/master c: d607af93006594f7da1d4b7d44724c5308f4e892 h: refs/heads/master i: 177585: 676b616dba13e900378594424231a2cb2545b10d 177583: 0d7a689a1568b52e1aef06169c6d2e9d09347e50 v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/msi-wmi.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 62b1ceee76de..c3851b9594a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 977f9b921c82726745a8b7281dc679edb32b4906 +refs/heads/master: d607af93006594f7da1d4b7d44724c5308f4e892 diff --git a/trunk/drivers/platform/x86/msi-wmi.c b/trunk/drivers/platform/x86/msi-wmi.c index d7579359a2c5..2c2afc1828b8 100644 --- a/trunk/drivers/platform/x86/msi-wmi.c +++ b/trunk/drivers/platform/x86/msi-wmi.c @@ -243,14 +243,10 @@ static void msi_wmi_notify(u32 value, void *context) } key->last_pressed = cur; - switch (key->type) { - case KE_KEY: - /* Brightness is served via acpi video driver */ - if (!backlight && - (key->keycode == KEY_BRIGHTNESSUP || - key->keycode == KEY_BRIGHTNESSDOWN)) - break; - + if (key->type == KE_KEY && + /* Brightness is served via acpi video driver */ + (backlight || (key->keycode != KEY_BRIGHTNESSUP && + key->keycode != KEY_BRIGHTNESSDOWN))) { dprintk("Send key: 0x%X - " "Input layer keycode: %d\n", key->code, key->keycode); @@ -260,7 +256,6 @@ static void msi_wmi_notify(u32 value, void *context) input_report_key(msi_wmi_input_dev, key->keycode, 0); input_sync(msi_wmi_input_dev); - break; } } else printk(KERN_INFO "Unknown key pressed - %x\n",