2 files changed, 4 insertions, 6 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index ba1c3644e6ac..de8220c3fb5f 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1373,8 +1373,10 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
         if ((connect_mask & HID_CONNECT_HIDRAW) && !hidraw_connect(hdev))
                 hdev->claimed |= HID_CLAIMED_HIDRAW;
 
-        if (!hdev->claimed) {
-                hid_err(hdev, "claimed by neither input, hiddev nor hidraw\n");
+        /* Drivers with the ->raw_event callback set are not required to connect
+         * to any other listener. */
+        if (!hdev->claimed && !hdev->driver->raw_event) {
+                hid_err(hdev, "device has no listeners, quitting\n");
                 return -ENODEV;
         }
 
diff --git a/drivers/hid/hid-picolcd.c b/drivers/hid/hid-picolcd.c
index 45c3433f7986..74c388dcb5b2 100644
--- a/drivers/hid/hid-picolcd.c
+++ b/drivers/hid/hid-picolcd.c
@@ -2613,11 +2613,7 @@ static int picolcd_probe(struct hid_device *hdev,
                 goto err_cleanup_data;
         }
 
-        /* We don't use hidinput but hid_hw_start() fails if nothing is
-         * claimed. So spoof claimed input. */
-        hdev->claimed = HID_CLAIMED_INPUT;
         error = hid_hw_start(hdev, 0);
-        hdev->claimed = 0;
         if (error) {
                 hid_err(hdev, "hardware start failed\n");
                 goto err_cleanup_data;