Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6

[linux-2.6-block.git] / net / bluetooth / hidp / core.c

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 09bedeb5579c6ecf5ba37488082f8e6c628641f7..49d8495d69be04bf2948e5467d6115eb0f7aa192 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -577,11 +577,6 @@ static int hidp_session(void *arg)
        }
 
        if (session->hid) {
-               if (session->hid->claimed & HID_CLAIMED_INPUT)
-                       hidinput_disconnect(session->hid);
-               if (session->hid->claimed & HID_CLAIMED_HIDRAW)
-                       hidraw_disconnect(session->hid);
-
                hid_destroy_device(session->hid);
                session->hid = NULL;
        }
@@ -747,8 +742,6 @@ static void hidp_stop(struct hid_device *hid)
        skb_queue_purge(&session->ctrl_transmit);
        skb_queue_purge(&session->intr_transmit);
 
-       if (hid->claimed & HID_CLAIMED_INPUT)
-               hidinput_disconnect(hid);
        hid->claimed = 0;
 }