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

Commit 99d24902 authored by Fernando Luis Vázquez Cao's avatar Fernando Luis Vázquez Cao Committed by Jiri Kosina
Browse files

HID: clean up quirk for Sony RF receivers 



Document what the fix-up is does and make it more robust by ensuring
that it is only applied to the USB interface that corresponds to the
mouse (sony_report_fixup() is called once per interface during probing).

Cc: linux-input@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarFernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a4649184

drivers/hid/hid-sony.c

+12 −2
Original line number Diff line number Diff line
@@ -65,9 +65,19 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
{

	struct sony_sc *sc = hid_get_drvdata(hdev);



	if ((sc->quirks & VAIO_RDESC_CONSTANT) &&

			*rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) {

	/*

	 * Some Sony RF receivers wrongly declare the mouse pointer as a

	 * a constant non-data variable.

	 */

	if ((sc->quirks & VAIO_RDESC_CONSTANT) && *rsize >= 56 &&

	    /* usage page: generic desktop controls */

	    /* rdesc[0] == 0x05 && rdesc[1] == 0x01 && */

	    /* usage: mouse */

	    rdesc[2] == 0x09 && rdesc[3] == 0x02 &&

	    /* input (usage page for x,y axes): constant, variable, relative */

	    rdesc[54] == 0x81 && rdesc[55] == 0x07) {

		hid_info(hdev, "Fixing up Sony RF Receiver report descriptor\n");

		/* input: data, variable, relative */

		rdesc[55] = 0x06;

	}