diff options
| author | Chase Douglas <chase.douglas@ubuntu.com> | 2010-08-31 21:56:19 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-09-03 15:57:43 +0200 |
| commit | 0773590c89fee9c62eaddc5459e52ba96173f930 (patch) | |
| tree | 9a688ed981c943b62bd01da3ca318dd96f040a43 /drivers/hid | |
| parent | c61b7cee672cc7276619ac0edf8f426e2f9e63e9 (diff) | |
| download | linux-stable-0773590c89fee9c62eaddc5459e52ba96173f930.tar.gz linux-stable-0773590c89fee9c62eaddc5459e52ba96173f930.tar.bz2 linux-stable-0773590c89fee9c62eaddc5459e52ba96173f930.zip | |
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: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 945850b42bc1..004c01d9a61a 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -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, const struct hid_device_id *id) { - __u8 feature_1[] = { 0xd7, 0x01 }; - __u8 feature_2[] = { 0xf8, 0x01, 0x32 }; + __u8 feature[] = { 0xd7, 0x01 }; struct input_dev *input; struct magicmouse_sc *msc; struct hid_report *report; @@ -408,17 +407,10 @@ static int magicmouse_probe(struct hid_device *hdev, } 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); - if (ret != sizeof(feature_1)) { - dev_err(&hdev->dev, "unable to request touch data (1:%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", + if (ret != sizeof(feature)) { + dev_err(&hdev->dev, "unable to request touch data (%d)\n", ret); goto err_stop_hw; } |