44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From: Jiri Kosina <jkosina@suse.cz>
|
|
Date: Thu, 16 Jun 2011 10:21:34 +0000 (+0200)
|
|
Subject: Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"
|
|
X-Git-Tag: v3.0-rc4~20^2
|
|
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=c3a4924565e2eecf2539871abd123d35be6d76d5
|
|
|
|
Revert "HID: magicmouse: ignore 'ivalid report id' while switching modes"
|
|
|
|
This reverts commit 23746a66d7d9e73402c68ef00d708796b97ebd72.
|
|
|
|
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: Ed Tomlinson <edt@aei.ca>
|
|
Reported-and-tested-by: Chase Douglas <chase.douglas@canonical.com>
|
|
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
|
---
|
|
|
|
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
|
|
index a5eda4c..0ec91c1 100644
|
|
--- a/drivers/hid/hid-magicmouse.c
|
|
+++ b/drivers/hid/hid-magicmouse.c
|
|
@@ -501,17 +501,9 @@ static int magicmouse_probe(struct hid_device *hdev,
|
|
}
|
|
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),
|
|
HID_FEATURE_REPORT);
|
|
- if (ret != -EIO) {
|
|
+ if (ret != sizeof(feature)) {
|
|
hid_err(hdev, "unable to request touch data (%d)\n", ret);
|
|
goto err_stop_hw;
|
|
}
|