aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-magicmouse.c16
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
367static int magicmouse_probe(struct hid_device *hdev, 367static int magicmouse_probe(struct hid_device *hdev,
368 const struct hid_device_id *id) 368 const struct hid_device_id *id)
369{ 369{
370 __u8 feature_1[] = { 0xd7, 0x01 }; 370 __u8 feature[] = { 0xd7, 0x01 };
371 __u8 feature_2[] = { 0xf8, 0x01, 0x32 };
372 struct input_dev *input; 371 struct input_dev *input;
373 struct magicmouse_sc *msc; 372 struct magicmouse_sc *msc;
374 struct hid_report *report; 373 struct hid_report *report;
@@ -408,17 +407,10 @@ static int magicmouse_probe(struct hid_device *hdev,
408 } 407 }
409 report->size = 6; 408 report->size = 6;
410 409
411 ret = hdev->hid_output_raw_report(hdev, feature_1, sizeof(feature_1), 410 ret = hdev->hid_output_raw_report(hdev, feature, sizeof(feature),
412 HID_FEATURE_REPORT); 411 HID_FEATURE_REPORT);
413 if (ret != sizeof(feature_1)) { 412 if (ret != sizeof(feature)) {
414 dev_err(&hdev->dev, "unable to request touch data (1:%d)\n", 413 dev_err(&hdev->dev, "unable to request touch data (%d)\n",
415 ret);
416 goto err_stop_hw;
417 }
418 ret = hdev->hid_output_raw_report(hdev, feature_2,
419 sizeof(feature_2), HID_FEATURE_REPORT);
420 if (ret != sizeof(feature_2)) {
421 dev_err(&hdev->dev, "unable to request touch data (2:%d)\n",
422 ret); 414 ret);
423 goto err_stop_hw; 415 goto err_stop_hw;
424 } 416 }