diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-09-15 10:27:45 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-09-17 09:15:11 -0400 |
commit | c4c259bcc27c4242b012106afdba183622b1735f (patch) | |
tree | 5db41b8ea3d43f3a10479257da302590a6b974f2 /net | |
parent | d1ff65226c5afe55f9af38a439058f41b71e114f (diff) |
HID: consolidate connect and disconnect into core code
HID core registers input, hidraw and hiddev devices, but leaves
unregistering it up to the individual driver, which is not really nice.
Let's move all the logic to the core.
Reported-by: Marcel Holtmann <marcel@holtmann.org>
Reported-by: Brian Rogers <brian@xyzw.org>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/hidp/core.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 09bedeb5579c..49d8495d69be 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c | |||
@@ -577,11 +577,6 @@ static int hidp_session(void *arg) | |||
577 | } | 577 | } |
578 | 578 | ||
579 | if (session->hid) { | 579 | if (session->hid) { |
580 | if (session->hid->claimed & HID_CLAIMED_INPUT) | ||
581 | hidinput_disconnect(session->hid); | ||
582 | if (session->hid->claimed & HID_CLAIMED_HIDRAW) | ||
583 | hidraw_disconnect(session->hid); | ||
584 | |||
585 | hid_destroy_device(session->hid); | 580 | hid_destroy_device(session->hid); |
586 | session->hid = NULL; | 581 | session->hid = NULL; |
587 | } | 582 | } |
@@ -747,8 +742,6 @@ static void hidp_stop(struct hid_device *hid) | |||
747 | skb_queue_purge(&session->ctrl_transmit); | 742 | skb_queue_purge(&session->ctrl_transmit); |
748 | skb_queue_purge(&session->intr_transmit); | 743 | skb_queue_purge(&session->intr_transmit); |
749 | 744 | ||
750 | if (hid->claimed & HID_CLAIMED_INPUT) | ||
751 | hidinput_disconnect(hid); | ||
752 | hid->claimed = 0; | 745 | hid->claimed = 0; |
753 | } | 746 | } |
754 | 747 | ||