Merge tag 'mac80211-for-davem-2015-05-28' of git://git.kernel.org/pub/scm/linux/kerne...

[linux-2.6-microblaze.git] / drivers / tty / vt / vt_ioctl.c

diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 2bd78e2..97d5a74 100644 (file)
--- a/drivers/tty/vt/vt_ioctl.c
+++ b/drivers/tty/vt/vt_ioctl.c
@@ -388,7 +388,7 @@ int vt_ioctl(struct tty_struct *tty,
                 * Generate the tone for the appropriate number of ticks.
                 * If the time is zero, turn off sound ourselves.
                 */
-               ticks = HZ * ((arg >> 16) & 0xffff) / 1000;
+               ticks = msecs_to_jiffies((arg >> 16) & 0xffff);
                count = ticks ? (arg & 0xffff) : 0;
                if (count)
                        count = PIT_TICK_RATE / count;