提交 e5a2a04c 编写于 作者: J Jindrich Makovicka 提交者: Jiri Kosina

HID: check for HID_QUIRK_IGNORE during probing

While the hardcoded ignore list is checked in hid_add_device(), the
user supplied ignore flags are not. Thus, the IGNORE quirk (0x0004)
cannot be used to stop usbhid from binding devices like iBuddy, which
has been recently removed from the ignore list due to product ID
conflict.

This patch adds the user quirk check to hid_add_device(), and makes
hid_add_device() return -ENODEV when HID_QUIRK_IGNORE bit is set.

HID_QUIRK_NO_IGNORE still takes precedence over HID_QUIRK_IGNORE.

With the patch, iBuddy works properly using libusb when the following
option is added to modprobe.d:

options usbhid quirks=0x1130:0x0002:0x0004
Signed-off-by: NJindrich Makovicka <makovick@gmail.com>
Signed-off-by: NJiri Kosina <jkosina@suse.cz>
上级 fdd45ef4
...@@ -1760,7 +1760,8 @@ int hid_add_device(struct hid_device *hdev) ...@@ -1760,7 +1760,8 @@ int hid_add_device(struct hid_device *hdev)
/* we need to kill them here, otherwise they will stay allocated to /* we need to kill them here, otherwise they will stay allocated to
* wait for coming driver */ * wait for coming driver */
if (!(hdev->quirks & HID_QUIRK_NO_IGNORE) && hid_ignore(hdev)) if (!(hdev->quirks & HID_QUIRK_NO_IGNORE)
&& (hid_ignore(hdev) || (hdev->quirks & HID_QUIRK_IGNORE)))
return -ENODEV; return -ENODEV;
/* XXX hack, any other cleaner solution after the driver core /* XXX hack, any other cleaner solution after the driver core
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册