diff options
author | Corentin Chary <corentincj@iksaif.net> | 2011-02-26 04:20:32 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:07:20 -0400 |
commit | 57ab7dae27fae6a492ec968dc543106685adcad5 (patch) | |
tree | 239d85862bf4eda7adb47a331beb012696fa48b3 /drivers/platform/x86/asus-wmi.c | |
parent | e12e6d94db24e9050821965aa75c95e8d2c65f10 (diff) |
asus-wmi: minor cleanups
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86/asus-wmi.c')
-rw-r--r-- | drivers/platform/x86/asus-wmi.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 35e6bb6c266d..4c3f68a495d7 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * Asus PC WMI hotkey driver | 2 | * Asus PC WMI hotkey driver |
3 | * | 3 | * |
4 | * Copyright(C) 2010 Intel Corporation. | 4 | * Copyright(C) 2010 Intel Corporation. |
5 | * Copyright(C) 2010 Corentin Chary <corentin.chary@gmail.com> | 5 | * Copyright(C) 2010-2011 Corentin Chary <corentin.chary@gmail.com> |
6 | * | 6 | * |
7 | * Portions based on wistron_btns.c: | 7 | * Portions based on wistron_btns.c: |
8 | * Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz> | 8 | * Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz> |
@@ -87,7 +87,7 @@ MODULE_LICENSE("GPL"); | |||
87 | #define ASUS_WMI_DEVID_CARDREADER 0x00080013 | 87 | #define ASUS_WMI_DEVID_CARDREADER 0x00080013 |
88 | 88 | ||
89 | /* Input */ | 89 | /* Input */ |
90 | #define ASUS_WMI_DEVID_TOUCHPAD 0x00100011 | 90 | #define ASUS_WMI_DEVID_TOUCHPAD 0x00100011 |
91 | #define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012 | 91 | #define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012 |
92 | 92 | ||
93 | /* DSTS masks */ | 93 | /* DSTS masks */ |
@@ -903,25 +903,25 @@ static void asus_wmi_notify(u32 value, void *context) | |||
903 | 903 | ||
904 | obj = (union acpi_object *)response.pointer; | 904 | obj = (union acpi_object *)response.pointer; |
905 | 905 | ||
906 | if (obj && obj->type == ACPI_TYPE_INTEGER) { | 906 | if (!obj || obj->type != ACPI_TYPE_INTEGER) |
907 | code = obj->integer.value; | 907 | goto exit; |
908 | orig_code = code; | ||
909 | 908 | ||
910 | if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) | 909 | code = obj->integer.value; |
911 | code = NOTIFY_BRNUP_MIN; | 910 | orig_code = code; |
912 | else if (code >= NOTIFY_BRNDOWN_MIN && | ||
913 | code <= NOTIFY_BRNDOWN_MAX) | ||
914 | code = NOTIFY_BRNDOWN_MIN; | ||
915 | 911 | ||
916 | if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) { | 912 | if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) |
917 | if (!acpi_video_backlight_support()) | 913 | code = NOTIFY_BRNUP_MIN; |
918 | asus_wmi_backlight_notify(asus, orig_code); | 914 | else if (code >= NOTIFY_BRNDOWN_MIN && |
919 | } | 915 | code <= NOTIFY_BRNDOWN_MAX) |
916 | code = NOTIFY_BRNDOWN_MIN; | ||
920 | 917 | ||
921 | if (!sparse_keymap_report_event(asus->inputdev, code, 1, true)) | 918 | if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) { |
922 | pr_info("Unknown key %x pressed\n", code); | 919 | if (!acpi_video_backlight_support()) |
923 | } | 920 | asus_wmi_backlight_notify(asus, orig_code); |
921 | } else if (!sparse_keymap_report_event(asus->inputdev, code, 1, true)) | ||
922 | pr_info("Unknown key %x pressed\n", code); | ||
924 | 923 | ||
924 | exit: | ||
925 | kfree(obj); | 925 | kfree(obj); |
926 | } | 926 | } |
927 | 927 | ||