diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/joystick/db9.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/atkbd.c | 2 | ||||
-rw-r--r-- | drivers/input/misc/wistron_btns.c | 19 |
3 files changed, 21 insertions, 2 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index 6f31f054d1bb..5080e15c6d30 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c | |||
@@ -584,7 +584,7 @@ static struct db9 __init *db9_probe(int parport, int mode) | |||
584 | goto err_out; | 584 | goto err_out; |
585 | } | 585 | } |
586 | 586 | ||
587 | if (db9_mode[mode].bidirectional && !(pp->modes & PARPORT_MODE_TRISTATE)) { | 587 | if (db9_mode->bidirectional && !(pp->modes & PARPORT_MODE_TRISTATE)) { |
588 | printk(KERN_ERR "db9.c: specified parport is not bidirectional\n"); | 588 | printk(KERN_ERR "db9.c: specified parport is not bidirectional\n"); |
589 | err = -EINVAL; | 589 | err = -EINVAL; |
590 | goto err_put_pp; | 590 | goto err_put_pp; |
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index ffde8f86e0fb..ce1f10e8984b 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c | |||
@@ -459,7 +459,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, | |||
459 | } | 459 | } |
460 | 460 | ||
461 | input_regs(dev, regs); | 461 | input_regs(dev, regs); |
462 | input_report_key(dev, keycode, value); | 462 | input_event(dev, EV_KEY, keycode, value); |
463 | input_sync(dev); | 463 | input_sync(dev); |
464 | 464 | ||
465 | if (value && add_release_event) { | 465 | if (value && add_release_event) { |
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index e4e5be111c96..ccf0faeee5c1 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
@@ -285,6 +285,15 @@ static struct key_entry keymap_fujitsu_n3510[] = { | |||
285 | { KE_END, 0 } | 285 | { KE_END, 0 } |
286 | }; | 286 | }; |
287 | 287 | ||
288 | static struct key_entry keymap_wistron_ms2111[] = { | ||
289 | { KE_KEY, 0x11, KEY_PROG1 }, | ||
290 | { KE_KEY, 0x12, KEY_PROG2 }, | ||
291 | { KE_KEY, 0x13, KEY_PROG3 }, | ||
292 | { KE_KEY, 0x31, KEY_MAIL }, | ||
293 | { KE_KEY, 0x36, KEY_WWW }, | ||
294 | { KE_END, 0 } | ||
295 | }; | ||
296 | |||
288 | static struct key_entry keymap_wistron_ms2141[] = { | 297 | static struct key_entry keymap_wistron_ms2141[] = { |
289 | { KE_KEY, 0x11, KEY_PROG1 }, | 298 | { KE_KEY, 0x11, KEY_PROG1 }, |
290 | { KE_KEY, 0x12, KEY_PROG2 }, | 299 | { KE_KEY, 0x12, KEY_PROG2 }, |
@@ -326,6 +335,7 @@ static struct key_entry keymap_aopen_1559as[] = { | |||
326 | { KE_WIFI, 0x30, 0 }, | 335 | { KE_WIFI, 0x30, 0 }, |
327 | { KE_KEY, 0x31, KEY_MAIL }, | 336 | { KE_KEY, 0x31, KEY_MAIL }, |
328 | { KE_KEY, 0x36, KEY_WWW }, | 337 | { KE_KEY, 0x36, KEY_WWW }, |
338 | { KE_END, 0 }, | ||
329 | }; | 339 | }; |
330 | 340 | ||
331 | /* | 341 | /* |
@@ -388,6 +398,15 @@ static struct dmi_system_id dmi_ids[] = { | |||
388 | }, | 398 | }, |
389 | .driver_data = keymap_aopen_1559as | 399 | .driver_data = keymap_aopen_1559as |
390 | }, | 400 | }, |
401 | { | ||
402 | .callback = dmi_matched, | ||
403 | .ident = "Medion MD 9783", | ||
404 | .matches = { | ||
405 | DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"), | ||
406 | DMI_MATCH(DMI_PRODUCT_NAME, "MD 9783"), | ||
407 | }, | ||
408 | .driver_data = keymap_wistron_ms2111 | ||
409 | }, | ||
391 | { NULL, } | 410 | { NULL, } |
392 | }; | 411 | }; |
393 | 412 | ||