diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-05 11:17:04 +0200 |
| commit | 74bf40f0793fed9e01eb6164c2ce63e8c27ca205 (patch) | |
| tree | f41312c0943978842ac258873b29da04d72d0625 /sound/oss/waveartist.c | |
| parent | e71981343ad29b5d929f82ac56c0b27b8ea0e540 (diff) | |
| parent | c4685849b4d725ab80cd29f5e09f5f128b4724b5 (diff) | |
| download | kernel_samsung_smdk4412-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.zip kernel_samsung_smdk4412-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.tar.gz kernel_samsung_smdk4412-74bf40f0793fed9e01eb6164c2ce63e8c27ca205.tar.bz2 | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/oss/waveartist.c')
| -rw-r--r-- | sound/oss/waveartist.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index e688dde..5246874 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 |