diff options
| author | Jamie Lentin <jm@lentin.co.uk> | 2014-11-09 07:54:29 +0000 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-11-11 11:46:32 +0100 |
| commit | 5556eb14b4cbf5dce840194ab591027322cbdb1f (patch) | |
| tree | 3c84b78d8c3e6a1b1d494e2490168f9b7733e91f | |
| parent | 7f474df0a7b7dadfc01ba778460a91f554ca1481 (diff) | |
| download | talos-obmc-linux-5556eb14b4cbf5dce840194ab591027322cbdb1f.tar.gz talos-obmc-linux-5556eb14b4cbf5dce840194ab591027322cbdb1f.zip | |
HID: lenovo: Move USB KEY_FILE to 0x00f9 to prevent scancode clash
The bluetooth keyboard also generates 0x00fa when the middle button is
pressed. Move the made-up report out of the way so we don't trigger
KEY_FILE when middle button is pressed
Signed-off-by: Jamie Lentin <jm@lentin.co.uk>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-lenovo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c index bf227f7679af..4716f1e59eca 100644 --- a/drivers/hid/hid-lenovo.c +++ b/drivers/hid/hid-lenovo.c @@ -85,13 +85,13 @@ static int lenovo_input_mapping_cptkbd(struct hid_device *hdev, case 0x00f8: /* Fn-F11: View open applications (3 boxes) */ map_key_clear(KEY_SCALE); return 1; - case 0x00fa: /* Fn-Esc: Fn-lock toggle */ - map_key_clear(KEY_FN_ESC); - return 1; - case 0x00fb: /* Fn-F12: Open My computer (6 boxes) USB-only */ + case 0x00f9: /* Fn-F12: Open My computer (6 boxes) USB-only */ /* NB: This mapping is invented in raw_event below */ map_key_clear(KEY_FILE); return 1; + case 0x00fa: /* Fn-Esc: Fn-lock toggle */ + map_key_clear(KEY_FN_ESC); + return 1; } } @@ -207,8 +207,8 @@ static int lenovo_raw_event(struct hid_device *hdev, && data[0] == 0x15 && data[1] == 0x94 && data[2] == 0x01)) { - data[1] = 0x0; - data[2] = 0x4; + data[1] = 0x00; + data[2] = 0x01; } return 0; |
