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

Commit eb626c57 authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

HID: logitech-hidpp: handle battery events in hidpp_raw_hidpp_event() 



Battery events are reported through HID++, so we need to be sure
the report ID is the HID++ one.

Without this, we might receive keyboard events that looks just like
battery events with wrong data and which will confuse user space.

Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 2936836f

drivers/hid/hid-logitech-hidpp.c

+7 −6
Original line number Diff line number Diff line
@@ -2250,6 +2250,7 @@ static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data, 
	struct hidpp_report *question = hidpp->send_receive_buf;

	struct hidpp_report *answer = hidpp->send_receive_buf;

	struct hidpp_report *report = (struct hidpp_report *)data;

	int ret;



	/*

	 * If the mutex is locked then we have a pending answer from a
@@ -2283,6 +2284,12 @@ static int hidpp_raw_hidpp_event(struct hidpp_device *hidpp, u8 *data, 
		return 1;

	}



	if (hidpp->capabilities & HIDPP_CAPABILITY_HIDPP20_BATTERY) {

		ret = hidpp20_battery_event(hidpp, data, size);

		if (ret != 0)

			return ret;

	}



	return 0;

}
@@ -2325,12 +2332,6 @@ static int hidpp_raw_event(struct hid_device *hdev, struct hid_report *report, 
	if (ret != 0)

		return ret;



	if (hidpp->capabilities & HIDPP_CAPABILITY_HIDPP20_BATTERY) {

		ret = hidpp20_battery_event(hidpp, data, size);

		if (ret != 0)

			return ret;

	}



	if (hidpp->quirks & HIDPP_QUIRK_CLASS_WTP)

		return wtp_raw_event(hdev, data, size);

	else if (hidpp->quirks & HIDPP_QUIRK_CLASS_M560)