Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...

[mv-sheeva.git] / sound / oss / waveartist.c

diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c
index e688dde6bbdeb0b54ae26c761eaba38b1ede5a95..52468742d9f240650376da69b368927c095041e7 100644 (file)
--- 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