1 files changed, 8 insertions, 1 deletions

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 0c0028463fa..b2bcbe2dc32 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -945,6 +945,13 @@ static int hidp_setup_hid(struct hidp_session *session,
         hid->hid_get_raw_report = hidp_get_raw_report;
         hid->hid_output_raw_report = hidp_output_raw_report;
 
+        /* True if device is blacklisted in drivers/hid/hid-core.c */
+        if (hid_ignore(hid)) {
+                hid_destroy_device(session->hid);
+                session->hid = NULL;
+                return -ENODEV;
+        }
+
         return 0;
 
 fault:
@@ -1017,7 +1024,7 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
 
         if (req->rd_size > 0) {
                 err = hidp_setup_hid(session, req);
-                if (err)
+                if (err && err != -ENODEV)
                         goto purge;
         }