Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID updates from Jiri Kosina:
 - HID battery handling cleanup by David Herrmann
 - ELO 4000/4500 driver, which has been finally ported to be proper HID
   driver by Jiri Slaby
 - ps3remote driver functionality is now provided by generic sony
   driver, by Jiri Kosina
 - PS2/3 Buzz controllers support, by Colin Leitner
 - rework of wiimote driver including full extensions hotpluggin
   support, sub-device modularization and speaker support by David
   Herrmann

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (55 commits)
  HID: wacom: Intuos4 battery charging changes
  HID: i2c-hid: support sending HID output reports using the output register
  HID: kye: Add report fixup for Genius Gila Gaming mouse
  HID: wiimote: support Nintendo Wii U Pro Controller
  Input: make gamepad API keycodes more clear
  input: document gamepad API and add extra keycodes
  HID: explain out-of-range check better
  HID: fix false positive out of range values
  HID: wiimote: fix coccinelle warnings
  HID: roccat: check cdev_add return value
  HID: fold ps3remote driver into generic Sony driver
  HID: hyperv: convert alloc+memcpy to memdup
  HID: core: fix reporting of raw events
  HID: wiimote: discard invalid EXT data reports
  HID: wiimote: fix classic controller parsing
  HID: wiimote: init EXT/MP during device detection
  HID: wiimote: fix DRM debug-attr to correctly parse input
  HID: wiimote: add MP quirks
  HID: wiimote: remove old static extension support
  HID: wiimote: add "bboard_calib" attribute
  ...

2 files changed, 49 insertions, 9 deletions

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 940f5acb6694..46c6a148f0b3 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -851,6 +851,29 @@ static void hidp_session_dev_del(struct hidp_session *session)
 }
 
 /*
+ * Asynchronous device registration
+ * HID device drivers might want to perform I/O during initialization to
+ * detect device types. Therefore, call device registration in a separate
+ * worker so the HIDP thread can schedule I/O operations.
+ * Note that this must be called after the worker thread was initialized
+ * successfully. This will then add the devices and increase session state
+ * on success, otherwise it will terminate the session thread.
+ */
+static void hidp_session_dev_work(struct work_struct *work)
+{
+        struct hidp_session *session = container_of(work,
+                                                    struct hidp_session,
+                                                    dev_init);
+        int ret;
+
+        ret = hidp_session_dev_add(session);
+        if (!ret)
+                atomic_inc(&session->state);
+        else
+                hidp_session_terminate(session);
+}
+
+/*
  * Create new session object
  * Allocate session object, initialize static fields, copy input data into the
  * object and take a reference to all sub-objects.
@@ -897,6 +920,7 @@ static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,
         session->idle_to = req->idle_to;
 
         /* device management */
+        INIT_WORK(&session->dev_init, hidp_session_dev_work);
         setup_timer(&session->timer, hidp_idle_timeout,
                     (unsigned long)session);
 
@@ -1035,8 +1059,8 @@ static void hidp_session_terminate(struct hidp_session *session)
  * Probe HIDP session
  * This is called from the l2cap_conn core when our l2cap_user object is bound
  * to the hci-connection. We get the session via the \user object and can now
- * start the session thread, register the HID/input devices and link it into
- * the global session list.
+ * start the session thread, link it into the global session list and
+ * schedule HID/input device registration.
  * The global session-list owns its own reference to the session object so you
  * can drop your own reference after registering the l2cap_user object.
  */
@@ -1058,21 +1082,30 @@ static int hidp_session_probe(struct l2cap_conn *conn,
                 goto out_unlock;
         }
 
+        if (session->input) {
+                ret = hidp_session_dev_add(session);
+                if (ret)
+                        goto out_unlock;
+        }
+
         ret = hidp_session_start_sync(session);
         if (ret)
-                goto out_unlock;
+                goto out_del;
 
-        ret = hidp_session_dev_add(session);
-        if (ret)
-                goto out_stop;
+        /* HID device registration is async to allow I/O during probe */
+        if (session->input)
+                atomic_inc(&session->state);
+        else
+                schedule_work(&session->dev_init);
 
         hidp_session_get(session);
         list_add(&session->list, &hidp_session_list);
         ret = 0;
         goto out_unlock;
 
-out_stop:
-        hidp_session_terminate(session);
+out_del:
+        if (session->input)
+                hidp_session_dev_del(session);
 out_unlock:
         up_write(&hidp_session_sem);
         return ret;
@@ -1102,7 +1135,12 @@ static void hidp_session_remove(struct l2cap_conn *conn,
         down_write(&hidp_session_sem);
 
         hidp_session_terminate(session);
-        hidp_session_dev_del(session);
+
+        cancel_work_sync(&session->dev_init);
+        if (session->input ||
+            atomic_read(&session->state) > HIDP_SESSION_PREPARING)
+                hidp_session_dev_del(session);
+
         list_del(&session->list);
 
         up_write(&hidp_session_sem);
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
index 6162ce8606ac..9e6cc3553105 100644
--- 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;