2015-05-02 16:03:24

by Nicholas Mc Guire

Subject: [PATCH] HID: make timeout HZ independent

wait_event_interruptible_timeout() expects a timeout in jiffies so the
numeric constant becomes HZ dependent - put it through msecs_to_jiffies()
to make it HZ independent.

Signed-off-by: Nicholas Mc Guire <[email protected]>
---

The comment indicates that the expected timeout should be 40 milliseconds

Patch was compile tested with x86_64_defconfig (implies
CONFIG_HID_LOGITECH=y)

Patch is against 4.0-rc1 (localversion-next is -next-20150501)

drivers/hid/hid-lg.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index b86c18e..2671de9 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -700,7 +700,8 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
/* insert a little delay of 10 jiffies ~ 40ms */
wait_queue_head_t wait;
init_waitqueue_head (&wait);
- wait_event_interruptible_timeout(wait, 0, 10);
+ wait_event_interruptible_timeout(wait, 0,
+ msecs_to_jiffies(40));

/* Select random Address */
buf[1] = 0xB2;
--
1.7.10.4

2015-05-07 08:33:16

by Jiri Kosina

Subject: Re: [PATCH] HID: make timeout HZ independent

On Sat, 2 May 2015, Nicholas Mc Guire wrote:

> wait_event_interruptible_timeout() expects a timeout in jiffies so the
> numeric constant becomes HZ dependent - put it through msecs_to_jiffies()
> to make it HZ independent.
>
> Signed-off-by: Nicholas Mc Guire <[email protected]>

Applied to for-4.2/logitech. Thanks,

--
Jiri Kosina
SUSE Labs