Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus

[sfrench/cifs-2.6.git] / net / bluetooth / hidp / core.c

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index f2cec70d520cc2b29606f51a5c2b3c19a7fdc838..1036e4fa1ea280db018831fb4fdcb8c09e0a2599 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -789,7 +789,7 @@ static int hidp_setup_hid(struct hidp_session *session,
        hid->dev.parent = &session->conn->hcon->dev;
        hid->ll_driver = &hidp_hid_driver;
 
-       /* True if device is blacklisted in drivers/hid/hid-core.c */
+       /* True if device is blacklisted in drivers/hid/hid-quirks.c */
        if (hid_ignore(hid)) {
                hid_destroy_device(session->hid);
                session->hid = NULL;