Merge tag 'drm-intel-next-fixes-2015-04-25' of git://anongit.freedesktop.org/drm...

[karo-tx-linux.git] / drivers / tty / vt / vt_ioctl.c

diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
index 2bd78e2ac8ecba07dbf42788b6c61506ee8b2b20..97d5a74558a3a4477e3c5cfb29dd88591fefbe92 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;