aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-02-17 17:58:53 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-26 14:42:39 -0500
commitf5ffd4620aba9e55656483ae1ef5c79ba81f5403 (patch)
tree0d78c4a51cf1cab12f7ba2852d4140be9639be2a
parente1aaadd4d8162a2c33e41dd5a72234ea4d3b014f (diff)
[Bluetooth] Add open and close callbacks for HID device
The open and close callbacks for the HID device are not optional, but for the Bluetooth HID report mode support it is enough to add empty dummy callbacks. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/hidp/core.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 05e23bbcb0a1..4c914df5fd06 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -670,6 +670,15 @@ static inline void hidp_setup_input(struct hidp_session *session, struct hidp_co
670 input_register_device(input); 670 input_register_device(input);
671} 671}
672 672
673static int hidp_open(struct hid_device *hid)
674{
675 return 0;
676}
677
678static void hidp_close(struct hid_device *hid)
679{
680}
681
673static inline void hidp_setup_hid(struct hidp_session *session, struct hidp_connadd_req *req) 682static inline void hidp_setup_hid(struct hidp_session *session, struct hidp_connadd_req *req)
674{ 683{
675 struct hid_device *hid = session->hid; 684 struct hid_device *hid = session->hid;
@@ -694,6 +703,9 @@ static inline void hidp_setup_hid(struct hidp_session *session, struct hidp_conn
694 703
695 hid->dev = hidp_get_device(session); 704 hid->dev = hidp_get_device(session);
696 705
706 hid->hid_open = hidp_open;
707 hid->hid_close = hidp_close;
708
697 hid->hidinput_input_event = hidp_hidinput_event; 709 hid->hidinput_input_event = hidp_hidinput_event;
698 710
699 list_for_each_entry(report, &hid->report_enum[HID_INPUT_REPORT].report_list, list) 711 list_for_each_entry(report, &hid->report_enum[HID_INPUT_REPORT].report_list, list)