aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-05-10 00:05:51 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-10 00:05:51 -0700
commit1dd5cc779345b9dd2e3e139c08c1c3b988482526 (patch)
treeb3c39f24a8387ae7bbeafa7ca734bae2af980092 /sound
parent521616213d818c4cea56983441d43f994d45ca59 (diff)
downloadhistory-1dd5cc779345b9dd2e3e139c08c1c3b988482526.tar.gz
[PATCH] CLOCK_TICK_RATE: use CLOCK_TICK_RATE
From: Thorsten Kranzkowski <dl8bcu@dl8bcu.de> use CLOCK_TICK_RATE where 1193180 was used in general timing calculations. (optional)
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/pas2_pcm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c
index 6805962afe5da3..e968659232cbfa 100644
--- a/sound/oss/pas2_pcm.c
+++ b/sound/oss/pas2_pcm.c
@@ -17,6 +17,7 @@
#include <linux/init.h>
#include <linux/spinlock.h>
+#include <asm/timex.h>
#include "sound_config.h"
#include "pas2.h"
@@ -62,13 +63,13 @@ static int pcm_set_speed(int arg)
if (pcm_channels & 2)
{
- foo = (596590 + (arg / 2)) / arg;
- arg = (596590 + (foo / 2)) / foo;
+ foo = ((CLOCK_TICK_RATE / 2) + (arg / 2)) / arg;
+ arg = ((CLOCK_TICK_RATE / 2) + (foo / 2)) / foo;
}
else
{
- foo = (1193180 + (arg / 2)) / arg;
- arg = (1193180 + (foo / 2)) / foo;
+ foo = (CLOCK_TICK_RATE + (arg / 2)) / arg;
+ arg = (CLOCK_TICK_RATE + (foo / 2)) / foo;
}
pcm_speed = arg;