summaryrefslogtreecommitdiffstats
path: root/drivers/usb/input
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@gmail.com>2007-01-11 16:51:16 +0200
committerJiri Kosina <jkosina@suse.cz>2007-02-05 10:00:02 +0100
commitc4146067fd7889bc6fab6cdfd8b2795d745a2156 (patch)
tree07075a36c816c0d821229a6cfed3eb4cc077db2c /drivers/usb/input
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff)
downloadop-kernel-dev-c4146067fd7889bc6fab6cdfd8b2795d745a2156.zip
op-kernel-dev-c4146067fd7889bc6fab6cdfd8b2795d745a2156.tar.gz
hid: allow force feedback for multi-input devices
Allow hid devices with HID_QUIRK_MULTI_INPUT to have force feedback. This was previously disabled because there were not any force feedback drivers for such devices. This will change with my upcoming patch. Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/usb/input')
-rw-r--r--drivers/usb/input/hid-core.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index c6c9e72..2971182 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1315,11 +1315,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
return -ENODEV;
}
- /* This only gets called when we are a single-input (most of the
- * time). IOW, not a HID_QUIRK_MULTI_INPUT. The hid_ff_init() is
- * only useful in this case, and not for multi-input quirks. */
- if ((hid->claimed & HID_CLAIMED_INPUT) &&
- !(hid->quirks & HID_QUIRK_MULTI_INPUT))
+ if ((hid->claimed & HID_CLAIMED_INPUT))
hid_ff_init(hid);
printk(KERN_INFO);
OpenPOWER on IntegriCloud