summaryrefslogtreecommitdiffstats
path: root/sound/oss/waveartist.c
diff options
context:
space:
mode:
authorKulikov Vasiliy <segooon@gmail.com>2010-07-26 12:29:22 +0400
committerTakashi Iwai <tiwai@suse.de>2010-07-26 10:33:41 +0200
commite5de3dfc391cceff6a4a3a0bb9c9c349a2e7c275 (patch)
tree028238c9ca3a193274f37fdef239d8b95a46c9e2 /sound/oss/waveartist.c
parent2232e238295d8ea707fe4271ffbfd4f32346aa81 (diff)
downloadlinux-e5de3dfc391cceff6a4a3a0bb9c9c349a2e7c275.tar.bz2
sound: oss: waveartist: simplify waveartist_sleep()
waveartist_sleep() uses loop with schedule_timeout() to unconditionally wait for msec. Use schedule_timeout_uninteruptible() instead. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss/waveartist.c')
-rw-r--r--sound/oss/waveartist.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index e688dde6bbde..52468742d9f2 100644
--- a/sound/oss/waveartist.c
+++ b/sound/oss/waveartist.c
@@ -184,14 +184,8 @@ waveartist_iack(wavnc_info *devc)
static inline int
waveartist_sleep(int timeout_ms)
{
- unsigned int timeout = timeout_ms * 10 * HZ / 100;
-
- do {
- set_current_state(TASK_INTERRUPTIBLE);
- timeout = schedule_timeout(timeout);
- } while (timeout);
-
- return 0;
+ unsigned int timeout = msecs_to_jiffies(timeout_ms*100);
+ return schedule_timeout_interruptible(timeout);
}
static int