diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-05-08 19:51:23 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2007-05-09 02:52:51 +0200 |
| commit | 3b180bff4c606b2596c40b26f85af6bc7d8cc50b (patch) | |
| tree | 2a1e29bf9bef51fbf2b790784c720683d4a98d20 /net/bluetooth/hidp | |
| parent | 59e7e36c325b4d447a490ee163eac23025763681 (diff) | |
| download | linux-stable-3b180bff4c606b2596c40b26f85af6bc7d8cc50b.tar.gz linux-stable-3b180bff4c606b2596c40b26f85af6bc7d8cc50b.tar.bz2 linux-stable-3b180bff4c606b2596c40b26f85af6bc7d8cc50b.zip | |
Bluetooth HID: HIDP - don't initialize force feedback
The current implementation of force feedback for HID devices is
USB-transport only and therefore calling hid_ff_init() from hidp code is
not going to work (plus it creates unwanted dependency of hidp on usbhid).
Remove the hid_ff_init() until either the hid-ff is made
transport-independent, or at least support for bluetooth transport is
added.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/hidp')
| -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 d342e89b8bdd..3e77e8102e08 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) |