input: Blacklist digitizers from joydev.c

This patch has been included in Ubuntu. Does it look sensible for upstream inclusion?

Stefan

From: Stefan Bader <[email protected]>
Date: Tue, 28 Apr 2009 16:44:18 +0200
Subject: [PATCH] UBUNTU: SAUCE: input: Blacklist digitizers from joydev.c

BTN_TOUCH is not set by the wacom driver which causes it to be handled by the joydev driver while the resulting device is broken. This causes problems with applications that try to use a joystick device.

---
 drivers/input/joydev.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

index a85b148..cef2333 100644
@@ -846,7 +846,13 @@ static const struct input_device_id joydev_blacklist[] = {
 				INPUT_DEVICE_ID_MATCH_KEYBIT,
 		.evbit = { BIT_MASK(EV_KEY) },
 		.keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) },
-	},	/* Avoid itouchpads, touchscreens and tablets */
+	},	/* Avoid itouchpads and touchscreens */
+	{
+		.flags = INPUT_DEVICE_ID_MATCH_EVBIT |
+				INPUT_DEVICE_ID_MATCH_KEYBIT,
+		.evbit = { BIT_MASK(EV_KEY) },
+		.keybit = { [BIT_WORD(BTN_DIGI)] = BIT_MASK(BTN_DIGI) },
+	},	/* Avoid tablets, digitisers and similar devices */
 	{ }	/* Terminating entry */
 };
 

1.5.4.3

Will apply, thanks. It is a bit unclear who is the author of the patch; it looks like Tim submitted it to the launchpad... who do I mark down as the guilty party? ;)

Thanks!

Dmitry

Yes, that would be my take as well. I put him to the signed-off for that reason. The only thing I did was adding a little description and headers.

Cheers,
Stefan

When all other means of communication fail, try words!