Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 95524
b: refs/heads/master
c: 9288902
h: refs/heads/master
v: v3
  • Loading branch information
Henrique de Moraes Holschuh authored and Len Brown committed Apr 29, 2008
1 parent ef452ae commit e78732d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b59727965d7f286489206c292e2788d4835a8a23
refs/heads/master: 92889022250d736e135ca92fbffd1ab0ea4780d1
17 changes: 17 additions & 0 deletions trunk/drivers/misc/thinkpad_acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ static struct {
u32 hotkey_poll_active:1;
} tp_features;

static struct {
u16 hotkey_mask_ff:1;
} tp_warned;

struct thinkpad_id_data {
unsigned int vendor; /* ThinkPad vendor:
* PCI_VENDOR_ID_IBM/PCI_VENDOR_ID_LENOVO */
Expand Down Expand Up @@ -1182,6 +1186,19 @@ static int hotkey_mask_set(u32 mask)
int rc = 0;

if (tp_features.hotkey_mask) {
if (!tp_warned.hotkey_mask_ff &&
(mask == 0xffff || mask == 0xffffff ||
mask == 0xffffffff)) {
tp_warned.hotkey_mask_ff = 1;
printk(TPACPI_NOTICE
"setting the hotkey mask to 0x%08x is likely "
"not the best way to go about it\n", mask);
printk(TPACPI_NOTICE
"please consider using the driver defaults, "
"and refer to up-to-date thinkpad-acpi "
"documentation\n");
}

HOTKEY_CONFIG_CRITICAL_START
for (i = 0; i < 32; i++) {
u32 m = 1 << i;
Expand Down

0 comments on commit e78732d

Please sign in to comment.