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

Commit 2161a2a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fix from Dmitry Torokhov:
 "One small change to make joydev (which is used by older games) to bind
  to devices that export Z axis but not X or Y (such as TRC rudder)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: joydev - recognize devices with Z axis as joysticks
parents dbd8805b 9fb6de1b

drivers/input/joydev.c

+6 −0
Original line number Diff line number Diff line
@@ -946,6 +946,12 @@ static const struct input_device_id joydev_ids[] = { 
		.evbit = { BIT_MASK(EV_ABS) },

		.absbit = { BIT_MASK(ABS_X) },

	},

	{

		.flags = INPUT_DEVICE_ID_MATCH_EVBIT |

				INPUT_DEVICE_ID_MATCH_ABSBIT,

		.evbit = { BIT_MASK(EV_ABS) },

		.absbit = { BIT_MASK(ABS_Z) },

	},

	{

		.flags = INPUT_DEVICE_ID_MATCH_EVBIT |

				INPUT_DEVICE_ID_MATCH_ABSBIT,