Commit 3797ef6b authored by David Herrmann's avatar David Herrmann Committed by Jiri Kosina
Browse files

HID: wacom: Set input bits before registration 



We shouldn't change the event flags of input devices after they get registered.
Otherwise, udev will not get notified of these flags and cannot setup the
devices properly.
This fixes the probing to set the input event flags on the input_mapped callback
instead of the probe function.

Reported-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarDavid Herrmann <dh.herrmann@googlemail.com>
Tested-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent f554ff80

drivers/hid/hid-wacom.c

+41 −35
Original line number Diff line number Diff line
@@ -304,11 +304,49 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report, 
	return 1;

}



static int wacom_input_mapped(struct hid_device *hdev, struct hid_input *hi,

	struct hid_field *field, struct hid_usage *usage, unsigned long **bit,

								int *max)

{

	struct input_dev *input = hi->input;



	/* Basics */

	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);



	__set_bit(REL_WHEEL, input->relbit);



	__set_bit(BTN_TOOL_PEN, input->keybit);

	__set_bit(BTN_TOUCH, input->keybit);

	__set_bit(BTN_STYLUS, input->keybit);

	__set_bit(BTN_STYLUS2, input->keybit);

	__set_bit(BTN_LEFT, input->keybit);

	__set_bit(BTN_RIGHT, input->keybit);

	__set_bit(BTN_MIDDLE, input->keybit);



	/* Pad */

	input->evbit[0] |= BIT(EV_MSC);



	__set_bit(MSC_SERIAL, input->mscbit);



	__set_bit(BTN_0, input->keybit);

	__set_bit(BTN_1, input->keybit);

	__set_bit(BTN_TOOL_FINGER, input->keybit);



	/* Distance, rubber and mouse */

	__set_bit(BTN_TOOL_RUBBER, input->keybit);

	__set_bit(BTN_TOOL_MOUSE, input->keybit);



	input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);

	input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);

	input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);

	input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);



	return 0;

}



static int wacom_probe(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	struct hid_input *hidinput;

	struct input_dev *input;

	struct wacom_data *wdata;

	int ret;
@@ -370,39 +408,6 @@ static int wacom_probe(struct hid_device *hdev, 
		goto err_ac;

	}

#endif

	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);

	input = hidinput->input;



	/* Basics */

	input->evbit[0] |= BIT(EV_KEY) | BIT(EV_ABS) | BIT(EV_REL);



	__set_bit(REL_WHEEL, input->relbit);



	__set_bit(BTN_TOOL_PEN, input->keybit);

	__set_bit(BTN_TOUCH, input->keybit);

	__set_bit(BTN_STYLUS, input->keybit);

	__set_bit(BTN_STYLUS2, input->keybit);

	__set_bit(BTN_LEFT, input->keybit);

	__set_bit(BTN_RIGHT, input->keybit);

	__set_bit(BTN_MIDDLE, input->keybit);



	/* Pad */

	input->evbit[0] |= BIT(EV_MSC);



	__set_bit(MSC_SERIAL, input->mscbit);



	__set_bit(BTN_0, input->keybit);

	__set_bit(BTN_1, input->keybit);

	__set_bit(BTN_TOOL_FINGER, input->keybit);



	/* Distance, rubber and mouse */

	__set_bit(BTN_TOOL_RUBBER, input->keybit);

	__set_bit(BTN_TOOL_MOUSE, input->keybit);



	input_set_abs_params(input, ABS_X, 0, 16704, 4, 0);

	input_set_abs_params(input, ABS_Y, 0, 12064, 4, 0);

	input_set_abs_params(input, ABS_PRESSURE, 0, 511, 0, 0);

	input_set_abs_params(input, ABS_DISTANCE, 0, 32, 0, 0);



	return 0;
@@ -446,6 +451,7 @@ static struct hid_driver wacom_driver = { 
	.probe = wacom_probe,

	.remove = wacom_remove,

	.raw_event = wacom_raw_event,

	.input_mapped = wacom_input_mapped,

};



static int __init wacom_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE