Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-22 12:24:38 +00:00
Code Issues Projects Releases Wiki Activity

ACPI: thinkpad-acpi: fix regression on HKEY LID event handling

Browse source 
We were letting ThinkPad-specific LID events through to userspace again,
instead of dropping them.  Fix it.  We don't want to give userspace the
option of not using generic LID handling.

Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Henrique de Moraes Holschuh 2007-09-23 11:39:05 -03:00 committed by Len Brown
parent 3eea123df1
commit 3e5ce914bd
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/misc/thinkpad_acpi.c
View file

@ -1197,6 +1197,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
u32 hkey;
unsigned int keycode, scancode;
int send_acpi_ev;
int ignore_acpi_ev;
if (event != 0x80) {
printk(IBM_ERR "unknown HKEY notification event %d\n", event);
@ -1219,6 +1220,7 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
}
send_acpi_ev = 0;
ignore_acpi_ev = 0;
switch (hkey >> 12) {
case 1:
@ -1244,6 +1246,8 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
"unknown LID-related HKEY event: 0x%04x\n",
hkey);
send_acpi_ev = 1;
} else {
ignore_acpi_ev = 1;
}
break;
case 7:
@ -1263,11 +1267,12 @@ static void hotkey_notify(struct ibm_struct *ibm, u32 event)
}
/* Legacy events */
if (send_acpi_ev || hotkey_report_mode < 2)
if (!ignore_acpi_ev && (send_acpi_ev || hotkey_report_mode < 2)) {
acpi_bus_generate_proc_event(ibm->acpi->device, event, hkey);
}
/* netlink events */
if (send_acpi_ev) {
if (!ignore_acpi_ev && send_acpi_ev) {
acpi_bus_generate_netlink_event(ibm->acpi->device->pnp.device_class,
ibm->acpi->device->dev.bus_id,
event, hkey);