diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 09:56:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 09:56:05 -0700 |
| commit | 5884c40668a928bba017eaf54e2eb3c01c8a98e6 (patch) | |
| tree | 240bdf1b015f0bc2ce8c1811bd0b528c1ef386c2 /net | |
| parent | ee54d2d87a8158d14434c1a3274bd7f713105836 (diff) | |
| parent | cdcb44e87bedcf5070eece61f89f9373a3810031 (diff) | |
| download | kernel-crypto-5884c40668a928bba017eaf54e2eb3c01c8a98e6.tar.gz kernel-crypto-5884c40668a928bba017eaf54e2eb3c01c8a98e6.tar.xz kernel-crypto-5884c40668a928bba017eaf54e2eb3c01c8a98e6.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jikos/hid:
USB HID: hiddev - fix race between hiddev_send_event() and hiddev_release()
HID: add hooks for getkeycode() and setkeycode() methods
HID: switch to using input_dev->dev.parent
USB HID: Logitech wheel 0x046d/0xc294 needs HID_QUIRK_NOGET quirk
USB HID: usb_buffer_free() cleanup
USB HID: report descriptor of Cypress USB barcode readers needs fixup
Bluetooth HID: HIDP - don't initialize force feedback
USB HID: update CONFIG_USB_HIDINPUT_POWERBOOK description
HID: add input mappings for non-working keys on Logitech S510 remote
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hidp/core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 0ea40ab4dba..ceadfcf457c 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -737,10 +737,8 @@ static inline void hidp_setup_hid(struct hidp_session *session, struct hidp_conn list_for_each_entry(report, &hid->report_enum[HID_FEATURE_REPORT].report_list, list) hidp_send_report(session, report); - if (hidinput_connect(hid) == 0) { + if (hidinput_connect(hid) == 0) hid->claimed |= HID_CLAIMED_INPUT; - hid_ff_init(hid); - } } int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock) |