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

Commit 57f7e160 authored Jul 17, 2015 by Jiri Kosina

Merge branch 'for-4.3/upstream' into for-4.3/wacom



There is a conflict between 67e123ff ("Delete unnecessary checks") sitting
in for-4.3/upstream and memory allocation failure handling from Jason Gerecke.
Pull this so that conflict could be resolved.

Signed-off-by: Jiri Kosina <jkosina@suse.com>

parents 70caee0a 3eb4351a

drivers/hid/hid-input.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1163,9 +1163,12 @@ void hidinput_hid_event(struct hid_device hid, struct hid_field field, struct

		input_event(input, usage->type, usage->code, value);

		if ((field->flags & HID_MAIN_ITEM_RELATIVE) && (usage->type == EV_KEY))
		if ((field->flags & HID_MAIN_ITEM_RELATIVE) &&
		usage->type == EV_KEY && value) {
		input_sync(input);
		input_event(input, usage->type, usage->code, 0);
		}
		}

		void hidinput_report_event(struct hid_device hid, struct hid_report report)
		{

drivers/hid/usbhid/hid-core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -710,6 +710,7 @@ int usbhid_open(struct hid_device *hid)
		* Wait 50 msec for the queue to empty before allowing events
		* to go through hid.
		*/
		if (res == 0 && !(hid->quirks & HID_QUIRK_ALWAYS_POLL))
		msleep(50);
		clear_bit(HID_RESUME_RUNNING, &usbhid->iofl);
		}

drivers/hid/wacom_sys.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1149,11 +1149,8 @@ static void wacom_free_inputs(struct wacom *wacom)
		{
		struct wacom_wac *wacom_wac = &(wacom->wacom_wac);

		if (wacom_wac->pen_input)
		input_free_device(wacom_wac->pen_input);
		if (wacom_wac->touch_input)
		input_free_device(wacom_wac->touch_input);
		if (wacom_wac->pad_input)
		input_free_device(wacom_wac->pad_input);
		wacom_wac->pen_input = NULL;
		wacom_wac->touch_input = NULL;