Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 215569
b: refs/heads/master
c: 0773590
h: refs/heads/master
i:
  215567: 048087c
v: v3
  • Loading branch information
Chase Douglas authored and Jiri Kosina committed Sep 3, 2010
1 parent 12c8e1b commit b0f028e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c61b7cee672cc7276619ac0edf8f426e2f9e63e9
refs/heads/master: 0773590c89fee9c62eaddc5459e52ba96173f930
16 changes: 4 additions & 12 deletions trunk/drivers/hid/hid-magicmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit b0f028e

Please sign in to comment.