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

Commit 40e1f20a authored by Roderick Colenbrander's avatar Roderick Colenbrander Committed by Kim Low
Browse files

UPSTREAM: HID: sony: Ignore DS4 dongle reports when no device is connected 



When the DS4 dongle is connected, it always generates HID reports
even when no DS4 is paired to it. This patch adds logic to ignore
HID reports from the dongle if there is no DS4 currently attached.

Signed-off-by: default avatarRoderick Colenbrander <roderick.colenbrander@sony.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
(cherry picked from commit 405182c2459fe2de4a3994ef39e866993e0e61d1)

Bug: 111431828
Signed-off-by: default avatarKim Low <kim-huei.low@sony.com>
Change-Id: Ice94c15f003b467cd9ba7e93cb1010767bccc8f9
parent fe9724e3

drivers/hid/hid-sony.c

+28 −0
Original line number Diff line number Diff line
@@ -1098,8 +1098,11 @@ struct sony_sc { 
	u8 led_delay_on[MAX_LEDS];

	u8 led_delay_off[MAX_LEDS];

	u8 led_count;

	bool ds4_dongle_connected;

};



static void sony_set_leds(struct sony_sc *sc);



static inline void sony_schedule_work(struct sony_sc *sc)

{

	if (!sc->defer_initialization)
@@ -1429,6 +1432,31 @@ static int sony_raw_event(struct hid_device *hdev, struct hid_report *report, 
				return -EILSEQ;

			}

		}



		/*

		 * In the case of a DS4 USB dongle, bit[2] of byte 31 indicates

		 * if a DS4 is actually connected (indicated by '0').

		 * For non-dongle, this bit is always 0 (connected).

		 */

		if (sc->hdev->vendor == USB_VENDOR_ID_SONY &&

		    sc->hdev->product == USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE) {

			bool connected = (rd[31] & 0x04) ? false : true;



			if (!sc->ds4_dongle_connected && connected) {

				hid_info(sc->hdev, "DualShock 4 USB dongle: controller connected\n");

				sony_set_leds(sc);

				sc->ds4_dongle_connected = true;

			} else if (sc->ds4_dongle_connected && !connected) {

				hid_info(sc->hdev, "DualShock 4 USB dongle: controller disconnected\n");

				sc->ds4_dongle_connected = false;

				/* Return 0, so hidraw can get the report. */

				return 0;

			} else if (!sc->ds4_dongle_connected) {

				/* Return 0, so hidraw can get the report. */

				return 0;

			}

		}



		dualshock4_parse_report(sc, rd, size);

	}