Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 104209
b: refs/heads/master
c: a894403
h: refs/heads/master
i:
  104207: 9bf1c90
v: v3
  • Loading branch information
Éric Piel authored and Dmitry Torokhov committed Jun 30, 2008
1 parent ac8a908 commit a3a333b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5a54c0115757fd98ca05efae626e6aebf54a8427
refs/heads/master: a894403766c93a8fae6de15684aa559fc78d5530
19 changes: 18 additions & 1 deletion trunk/drivers/input/misc/wistron_btns.c
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ static int wistron_setkeycode(struct input_dev *dev, int scancode, int keycode)

static int __devinit setup_input_dev(void)
{
const struct key_entry *key;
struct key_entry *key;
struct input_dev *input_dev;
int error;

Expand Down Expand Up @@ -1219,6 +1219,23 @@ static int __devinit setup_input_dev(void)
set_bit(key->sw.code, input_dev->swbit);
break;

/* if wifi or bluetooth are not available, create normal keys */
case KE_WIFI:
if (!have_wifi) {
key->type = KE_KEY;
key->keycode = KEY_WLAN;
key--;
}
break;

case KE_BLUETOOTH:
if (!have_bluetooth) {
key->type = KE_KEY;
key->keycode = KEY_BLUETOOTH;
key--;
}
break;

default:
break;
}
Expand Down

0 comments on commit a3a333b

Please sign in to comment.