diff options
| -rw-r--r-- | drivers/hid/hid-magicmouse.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 0d471fc2ab82..f10d56a15f21 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c | |||
| @@ -354,12 +354,15 @@ static int magicmouse_probe(struct hid_device *hdev, | |||
| 354 | goto err_free; | 354 | goto err_free; |
| 355 | } | 355 | } |
| 356 | 356 | ||
| 357 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDINPUT); | 357 | ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); |
| 358 | if (ret) { | 358 | if (ret) { |
| 359 | dev_err(&hdev->dev, "magicmouse hw start failed\n"); | 359 | dev_err(&hdev->dev, "magicmouse hw start failed\n"); |
| 360 | goto err_free; | 360 | goto err_free; |
| 361 | } | 361 | } |
| 362 | 362 | ||
| 363 | /* we are handling the input ourselves */ | ||
| 364 | hidinput_disconnect(hdev); | ||
| 365 | |||
| 363 | report = hid_register_report(hdev, HID_INPUT_REPORT, TOUCH_REPORT_ID); | 366 | report = hid_register_report(hdev, HID_INPUT_REPORT, TOUCH_REPORT_ID); |
| 364 | if (!report) { | 367 | if (!report) { |
| 365 | dev_err(&hdev->dev, "unable to register touch report\n"); | 368 | dev_err(&hdev->dev, "unable to register touch report\n"); |
