Merge branch 'for-5.14/core' into for-linus

[linux-block.git] / drivers / hid / hid-core.c

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 0de2788b9814ca1941251c7836561bd37cf13ab4..7db332139f7d5be9a1955cf070dbf08a027f03b7 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2306,12 +2306,8 @@ static int hid_device_remove(struct device *dev)
 {
        struct hid_device *hdev = to_hid_device(dev);
        struct hid_driver *hdrv;
-       int ret = 0;
 
-       if (down_interruptible(&hdev->driver_input_lock)) {
-               ret = -EINTR;
-               goto end;
-       }
+       down(&hdev->driver_input_lock);
        hdev->io_started = false;
 
        hdrv = hdev->driver;
@@ -2326,8 +2322,8 @@ static int hid_device_remove(struct device *dev)
 
        if (!hdev->io_started)
                up(&hdev->driver_input_lock);
-end:
-       return ret;
+
+       return 0;
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *a,