Merge branch 'topic/misc' into for-linus

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