Re: [PATCH 1/1] HID: hiddev: remove a duplicated check
From: Leizhen (ThunderTown) <hidden>
Date: 2020-01-14 09:16:23
Also in:
linux-usb
Does no one pay attention to this problem? Although there is no
functional problem, but it seems confusing.
if (!list->hiddev->exist) { <---------
res = -ENODEV; |
goto bail_unlock; |
} |
if (!list->hiddev->open++) |
if (list->hiddev->exist) { <--------- //It's always true.
On 2019/12/24 11:51, Zhen Lei wrote:quoted hunk ↗ jump to hunk
After commit 9c09b214f30e ("HID: hiddev: avoid opening a disconnected device"), the original check "list->hiddev->exist" become unnecessary. Signed-off-by: Zhen Lei <redacted> --- drivers/hid/usbhid/hiddev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index e421cdf2d1a4ec5..e04cf95fca094a8 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c@@ -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: