Merge tag 'trace-fixes-3.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / net / bluetooth / hidp / hidp.h

diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
index 6162ce8606acc8206dbc3ce437425518aee8a8c2..9e6cc355310504ae965035e033bdac7d5008527b 100644 (file)
--- a/net/bluetooth/hidp/hidp.h
+++ b/net/bluetooth/hidp/hidp.h
@@ -128,6 +128,7 @@ int hidp_get_conninfo(struct hidp_conninfo *ci);
 
 enum hidp_session_state {
        HIDP_SESSION_IDLING,
+       HIDP_SESSION_PREPARING,
        HIDP_SESSION_RUNNING,
 };
 
@@ -156,6 +157,7 @@ struct hidp_session {
        unsigned long idle_to;
 
        /* device management */
+       struct work_struct dev_init;
        struct input_dev *input;
        struct hid_device *hid;
        struct timer_list timer;