summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-05-02 17:55:15 +0200
committerJiri Kosina <jkosina@suse.cz>2015-05-07 10:32:22 +0200
commite03930620ae856a6ed79007207337d10011ecb36 (patch)
tree27ead853b3d6b94c98f6a15633fbb31d34b772eb /drivers
parent8de29a35dc840a05e451ad035bcb06e21ccf605f (diff)
downloadblackbird-op-linux-e03930620ae856a6ed79007207337d10011ecb36.tar.gz
blackbird-op-linux-e03930620ae856a6ed79007207337d10011ecb36.zip
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 <hofrat@osadl.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hid/hid-lg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index b86c18e651ed..2671de952e62 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;
OpenPOWER on IntegriCloud