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

Commit c3a49245 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes" 



This reverts commit 23746a66.

It turned out that the actual reason for failure is not the device
firmware, but bug in Bluetooth stack, which will be fixed by
patch by Ville Tervo which corrects the mask handling for CSR 1.1
Dongles.

Reported-and-tested-by: default avatarEd Tomlinson <edt@aei.ca>
Reported-and-tested-by: default avatarChase Douglas <chase.douglas@canonical.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b84bd27f

drivers/hid/hid-magicmouse.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -501,17 +501,9 @@ static int magicmouse_probe(struct hid_device *hdev, 
	}

	}

	report->size = 6;

	report->size = 6;





	/*

	 * The device reponds with 'invalid report id' when feature

	 * report switching it into multitouch mode is sent to it.

	 *

	 * This results in -EIO from the _raw low-level transport callback,

	 * but there seems to be no other way of switching the mode.

	 * Thus the super-ugly hacky success check below.

	 */

	ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),

	ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),

			HID_FEATURE_REPORT);

			HID_FEATURE_REPORT);

	if (ret != -EIO) {

	if (ret != sizeof(feature)) {

		hid_err(hdev, "unable to request touch data (%d)\n", ret);

		hid_err(hdev, "unable to request touch data (%d)\n", ret);

		goto err_stop_hw;

		goto err_stop_hw;

	}

	}