Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f7c5881 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input 

* master.kernel.org:/pub/scm/linux/kernel/git/dtor/input:
  Input: db9 - fix potential buffer overrun
  Input: atkbd - fix hardware autorepeat
  Input: wistron - add mapping for Wistron MS 2111
parents 1c952af5 0a3a6d69

drivers/input/joystick/db9.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static struct db9 __init *db9_probe(int parport, int mode) 
		goto err_out;

	}



	if (db9_mode[mode].bidirectional && !(pp->modes & PARPORT_MODE_TRISTATE)) {

	if (db9_mode->bidirectional && !(pp->modes & PARPORT_MODE_TRISTATE)) {

		printk(KERN_ERR "db9.c: specified parport is not bidirectional\n");

		err = -EINVAL;

		goto err_put_pp;

drivers/input/keyboard/atkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data, 
			}



			input_regs(dev, regs);

			input_report_key(dev, keycode, value);

			input_event(dev, EV_KEY, keycode, value);

			input_sync(dev);



			if (value && add_release_event) {

drivers/input/misc/wistron_btns.c

+19 −0
Original line number Diff line number Diff line
@@ -285,6 +285,15 @@ static struct key_entry keymap_fujitsu_n3510[] = { 
	{ KE_END, 0 }

};



static struct key_entry keymap_wistron_ms2111[] = {

	{ KE_KEY,  0x11, KEY_PROG1 },

	{ KE_KEY,  0x12, KEY_PROG2 },

	{ KE_KEY,  0x13, KEY_PROG3 },

	{ KE_KEY,  0x31, KEY_MAIL },

	{ KE_KEY,  0x36, KEY_WWW },

	{ KE_END,  0 }

};



static struct key_entry keymap_wistron_ms2141[] = {

	{ KE_KEY,  0x11, KEY_PROG1 },

	{ KE_KEY,  0x12, KEY_PROG2 },
@@ -326,6 +335,7 @@ static struct key_entry keymap_aopen_1559as[] = { 
	{ KE_WIFI, 0x30, 0 },

	{ KE_KEY,  0x31, KEY_MAIL },

	{ KE_KEY,  0x36, KEY_WWW },

	{ KE_END,  0 },

};



/*
@@ -388,6 +398,15 @@ static struct dmi_system_id dmi_ids[] = { 
		},

		.driver_data = keymap_aopen_1559as

	},

	{

		.callback = dmi_matched,

		.ident = "Medion MD 9783",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),

			DMI_MATCH(DMI_PRODUCT_NAME, "MD 9783"),

		},

		.driver_data = keymap_wistron_ms2111

	},

	{ NULL, }

};