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

Commit 6e026334 authored by Nikolai Kondrashov's avatar Nikolai Kondrashov Committed by Jiri Kosina
Browse files

HID: uclogic: Override constant descriptors 



Make uclogic_report_fixup override constant descriptors with generated
descriptors, so models reusing product ID, but working with generated
descriptor get correct one.

Signed-off-by: default avatarNikolai Kondrashov <spbnick@gmail.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 18e3dfac

drivers/hid/hid-uclogic.c

+6 −5
Original line number Diff line number Diff line
@@ -632,6 +632,12 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
	__u8 iface_num = iface->cur_altsetting->desc.bInterfaceNumber;

	struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);



	if (drvdata->rdesc != NULL) {

		rdesc = drvdata->rdesc;

		*rsize = drvdata->rsize;

		return rdesc;

	}



	switch (hdev->product) {

	case USB_DEVICE_ID_UCLOGIC_TABLET_PF1209:

		if (*rsize == PF1209_RDESC_ORIG_SIZE) {
@@ -701,11 +707,6 @@ static __u8 *uclogic_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
			break;

		}

		break;

	default:

		if (drvdata->rdesc != NULL) {

			rdesc = drvdata->rdesc;

			*rsize = drvdata->rsize;

		}

	}



	return rdesc;