2 files changed, 15 insertions, 0 deletions

diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index f85d94643aaf..24e91eb7f649 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -507,6 +507,11 @@ static int bnep_session(void *arg)
         /* Delete network device */
         unregister_netdev(dev);
 
+        /* Wakeup user-space polling for socket errors */
+        s->sock->sk->sk_err = EUNATCH;
+
+        wake_up_interruptible(s->sock->sk->sk_sleep);
+
         /* Release the socket */
         fput(s->sock->file);
 
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 519cdb920f93..96434d774c84 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -581,6 +581,12 @@ static int hidp_session(void *arg)
                 hid_free_device(session->hid);
         }
 
+        /* Wakeup user-space polling for socket errors */
+        session->intr_sock->sk->sk_err = EUNATCH;
+        session->ctrl_sock->sk->sk_err = EUNATCH;
+
+        hidp_schedule(session);
+
         fput(session->intr_sock->file);
 
         wait_event_timeout(*(ctrl_sk->sk_sleep),
@@ -879,6 +885,10 @@ int hidp_del_connection(struct hidp_conndel_req *req)
                         skb_queue_purge(&session->ctrl_transmit);
                         skb_queue_purge(&session->intr_transmit);
 
+                        /* Wakeup user-space polling for socket errors */
+                        session->intr_sock->sk->sk_err = EUNATCH;
+                        session->ctrl_sock->sk->sk_err = EUNATCH;
+
                         /* Kill session thread */
                         atomic_inc(&session->terminate);
                         hidp_schedule(session);