diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-12 16:01:26 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-12 16:01:31 +0200 |
| commit | 23d021167eebf0df5ccadf4f8de5ccb8d4ac2904 (patch) | |
| tree | 5b5fd57be0cdb3cdaf366b08e6f38e992bf62c1d /drivers | |
| parent | Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai... (diff) | |
| download | linux-23d021167eebf0df5ccadf4f8de5ccb8d4ac2904.tar.xz linux-23d021167eebf0df5ccadf4f8de5ccb8d4ac2904.zip | |
HID: magicmouse: fix input registration
When HIDRAW is not set, hid_hw_start() returns ENODEV as no subsystem has
claimed the magicmouse device, and probe routine bails out. Which is not what we want.
This happens because magicmouse driver is instantiating the connection to
Input subsystem itself, and since commit 28918c211d86b ("HID: magicmouse: fix
oops after device removal") the HID core is not registering input device
itself.
Fix this by letting HID core register the input device (so that hid_hw_start()
succeeds, as the device is claimed by at least one subsystem) and de-register
it again later before proceeding with proper input setup.
Reported-by: Justin P. Mattock <justinmattock@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
| -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, goto err_free; } - ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT & ~HID_CONNECT_HIDINPUT); + ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT); if (ret) { dev_err(&hdev->dev, "magicmouse hw start failed\n"); goto err_free; } + /* we are handling the input ourselves */ + hidinput_disconnect(hdev); + report = hid_register_report(hdev, HID_INPUT_REPORT, TOUCH_REPORT_ID); if (!report) { dev_err(&hdev->dev, "unable to register touch report\n"); |