| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1298712045-17671-4-git-send-email-corentincj@iksaif.net>
Date: Sat, 26 Feb 2011 10:20:32 +0100
From: Corentin Chary <corentincj@...aif.net>
To: Matthew Garrett <mjg@...hat.com>
Cc: Dmitry Torokhov <dmitry.torokhov@...il.com>,
Corentin Chary <corentincj@...aif.net>,
acpi4asus-user@...ts.sourceforge.net (open list:ASUS NOTEBOOKS AN...),
platform-driver-x86@...r.kernel.org (open list:ASUS NOTEBOOKS AN...),
linux-kernel@...r.kernel.org (open list)
Subject: [PATCH 03/14] asus-wmi: minor cleanups
Signed-off-by: Corentin Chary <corentincj@...aif.net>
---
drivers/platform/x86/asus-wmi.c | 34 +++++++++++++++++-----------------
drivers/platform/x86/eeepc-wmi.c | 2 +-
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index 35e6bb6..4c3f68a 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -2,7 +2,7 @@
* Asus PC WMI hotkey driver
*
* Copyright(C) 2010 Intel Corporation.
- * Copyright(C) 2010 Corentin Chary <corentin.chary@...il.com>
+ * Copyright(C) 2010-2011 Corentin Chary <corentin.chary@...il.com>
*
* Portions based on wistron_btns.c:
* Copyright (C) 2005 Miloslav Trmac <mitr@...ny.cz>
@@ -87,7 +87,7 @@ MODULE_LICENSE("GPL");
#define ASUS_WMI_DEVID_CARDREADER 0x00080013
/* Input */
-#define ASUS_WMI_DEVID_TOUCHPAD 0x00100011
+#define ASUS_WMI_DEVID_TOUCHPAD 0x00100011
#define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012
/* DSTS masks */
@@ -903,25 +903,25 @@ static void asus_wmi_notify(u32 value, void *context)
obj = (union acpi_object *)response.pointer;
- if (obj && obj->type == ACPI_TYPE_INTEGER) {
- code = obj->integer.value;
- orig_code = code;
+ if (!obj || obj->type != ACPI_TYPE_INTEGER)
+ goto exit;
- if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
- code = NOTIFY_BRNUP_MIN;
- else if (code >= NOTIFY_BRNDOWN_MIN &&
- code <= NOTIFY_BRNDOWN_MAX)
- code = NOTIFY_BRNDOWN_MIN;
+ code = obj->integer.value;
+ orig_code = code;
- if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) {
- if (!acpi_video_backlight_support())
- asus_wmi_backlight_notify(asus, orig_code);
- }
+ if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX)
+ code = NOTIFY_BRNUP_MIN;
+ else if (code >= NOTIFY_BRNDOWN_MIN &&
+ code <= NOTIFY_BRNDOWN_MAX)
+ code = NOTIFY_BRNDOWN_MIN;
- if (!sparse_keymap_report_event(asus->inputdev, code, 1, true))
- pr_info("Unknown key %x pressed\n", code);
- }
+ if (code == NOTIFY_BRNUP_MIN || code == NOTIFY_BRNDOWN_MIN) {
+ if (!acpi_video_backlight_support())
+ asus_wmi_backlight_notify(asus, orig_code);
+ } else if (!sparse_keymap_report_event(asus->inputdev, code, 1, true))
+ pr_info("Unknown key %x pressed\n", code);
+exit:
kfree(obj);
}
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c
index 3a060ae..e69701f 100644
--- a/drivers/platform/x86/eeepc-wmi.c
+++ b/drivers/platform/x86/eeepc-wmi.c
@@ -2,7 +2,7 @@
* Eee PC WMI hotkey driver
*
* Copyright(C) 2010 Intel Corporation.
- * Copyright(C) 2010 Corentin Chary <corentin.chary@...il.com>
+ * Copyright(C) 2010-2011 Corentin Chary <corentin.chary@...il.com>
*
* Portions based on wistron_btns.c:
* Copyright (C) 2005 Miloslav Trmac <mitr@...ny.cz>
--
1.7.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists