@@ -292,16 +292,16 @@ static int hiddev_open(struct inode *inode, struct file *file)
res = -ENODEV;
goto bail_unlock;
}
- if (!list->hiddev->open++)
- if (list->hiddev->exist) {
- struct hid_device *hid = hiddev->hid;
- res = hid_hw_power(hid, PM_HINT_FULLON);
- if (res < 0)
- goto bail_unlock;
- res = hid_hw_open(hid);
- if (res < 0)
- goto bail_normal_power;
- }
+ if (!list->hiddev->open++) {
+ struct hid_device *hid = hiddev->hid;
+
+ res = hid_hw_power(hid, PM_HINT_FULLON);
+ if (res < 0)
+ goto bail_unlock;
+ res = hid_hw_open(hid);
+ if (res < 0)
+ goto bail_normal_power;
+ }
mutex_unlock(&hiddev->existancelock);
return 0;
bail_normal_power:
After commit 9c09b214f30e ("HID: hiddev: avoid opening a disconnected device"), the original check "list->hiddev->exist" become unnecessary. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> --- drivers/hid/usbhid/hiddev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) -- 1.8.3