From ad6021340182e76eab2a7dd3243515f0bd1ace0f Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Mon, 26 Jul 2010 12:29:22 +0400
Subject: [PATCH] --- yaml --- r: 206689 b: refs/heads/master c:
 e5de3dfc391cceff6a4a3a0bb9c9c349a2e7c275 h: refs/heads/master i:   206687:
 c18f559c272bae02c43e1df76b370f478816532b v: v3

---
 [refs]                       |  2 +-
 trunk/sound/oss/waveartist.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index fef27ee02a42..84af4dbff44f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2232e238295d8ea707fe4271ffbfd4f32346aa81
+refs/heads/master: e5de3dfc391cceff6a4a3a0bb9c9c349a2e7c275
diff --git a/trunk/sound/oss/waveartist.c b/trunk/sound/oss/waveartist.c
index e688dde6bbde..52468742d9f2 100644
--- a/trunk/sound/oss/waveartist.c
+++ b/trunk/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