Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / drivers / usb / misc / legousbtower.c

diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 97cd9e2..7771be3 100644 (file)
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -574,7 +574,7 @@ static ssize_t tower_read (struct file *file, char __user *buffer, size_t count,
        }
 
        if (read_timeout) {
-               timeout = jiffies + read_timeout * HZ / 1000;
+               timeout = jiffies + msecs_to_jiffies(read_timeout);
        }
 
        /* wait for data */
@@ -592,7 +592,7 @@ static ssize_t tower_read (struct file *file, char __user *buffer, size_t count,
                /* reset read timeout during read or write activity */
                if (read_timeout
                    && (dev->read_buffer_length || dev->interrupt_out_busy)) {
-                       timeout = jiffies + read_timeout * HZ / 1000;
+                       timeout = jiffies + msecs_to_jiffies(read_timeout);
                }
                /* check for read timeout */
                if (read_timeout && time_after (jiffies, timeout)) {
@@ -831,7 +831,7 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
        dev->read_buffer_length = 0;
        dev->read_packet_length = 0;
        spin_lock_init (&dev->read_buffer_lock);
-       dev->packet_timeout_jiffies = packet_timeout * HZ / 1000;
+       dev->packet_timeout_jiffies = msecs_to_jiffies(packet_timeout);
        dev->read_last_arrival = jiffies;
 
        init_waitqueue_head (&dev->read_wait);