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

Commit 0773590c authored by Chase Douglas's avatar Chase Douglas Committed by Jiri Kosina
Browse files

HID: magicmouse: simplify multitouch feature request 



Only the first feature request is required to put the Magic Mouse into
multitouch mode. This is also the case for the Magic Trackpad, for which
support will be added in a later commit.

Signed-off-by: default avatarChase Douglas <chase.douglas@canonical.com>
Acked-by: default avatarMichael Poole <mdpoole@troilus.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c61b7cee

drivers/hid/hid-magicmouse.c

+4 −12
Original line number Original line Diff line number Diff line
@@ -367,8 +367,7 @@ static void magicmouse_setup_input(struct input_dev *input, struct hid_device *h 
static int magicmouse_probe(struct hid_device *hdev,

static int magicmouse_probe(struct hid_device *hdev,

	const struct hid_device_id *id)

	const struct hid_device_id *id)

{

{

	__u8 feature_1[] = { 0xd7, 0x01 };

	__u8 feature[] = { 0xd7, 0x01 };

	__u8 feature_2[] = { 0xf8, 0x01, 0x32 };

	struct input_dev *input;

	struct input_dev *input;

	struct magicmouse_sc *msc;

	struct magicmouse_sc *msc;

	struct hid_report *report;

	struct hid_report *report;
@@ -408,17 +407,10 @@ static int magicmouse_probe(struct hid_device *hdev, 
	}

	}

	report->size = 6;

	report->size = 6;





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

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

			HID_FEATURE_REPORT);

			HID_FEATURE_REPORT);

	if (ret != sizeof(feature_1)) {

	if (ret != sizeof(feature)) {

		dev_err(&hdev->dev, "unable to request touch data (1:%d)\n",

		dev_err(&hdev->dev, "unable to request touch data (%d)\n",

				ret);

		goto err_stop_hw;

	}

	ret = hdev->hid_output_raw_report(hdev, feature_2,

			sizeof(feature_2), HID_FEATURE_REPORT);

	if (ret != sizeof(feature_2)) {

		dev_err(&hdev->dev, "unable to request touch data (2:%d)\n",

				ret);

				ret);

		goto err_stop_hw;

		goto err_stop_hw;

	}

	}