summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-02-07 09:38:44 +0100
committerTakashi Iwai <tiwai@suse.de>2017-02-07 09:38:44 +0100
commit1e94320ffee29424ef70cdbb7f5601216382b7e6 (patch)
tree5558a860abefef6d348cd586cb3aa177de0d1476 /sound/core
parente1b239f371c0c745542cb8108d085ec728e8a69c (diff)
parentf3d83317a69e7d658e7c83e24f8b31ac533c39e3 (diff)
downloadlinux-1e94320ffee29424ef70cdbb7f5601216382b7e6.tar.bz2
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/seq/seq_memory.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index c850345c43b5..dfa5156f3585 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -419,7 +419,6 @@ int snd_seq_pool_done(struct snd_seq_pool *pool)
{
unsigned long flags;
struct snd_seq_event_cell *ptr;
- int max_count = 5 * HZ;
if (snd_BUG_ON(!pool))
return -EINVAL;
@@ -432,14 +431,8 @@ int snd_seq_pool_done(struct snd_seq_pool *pool)
if (waitqueue_active(&pool->output_sleep))
wake_up(&pool->output_sleep);
- while (atomic_read(&pool->counter) > 0) {
- if (max_count == 0) {
- pr_warn("ALSA: snd_seq_pool_done timeout: %d cells remain\n", atomic_read(&pool->counter));
- break;
- }
+ while (atomic_read(&pool->counter) > 0)
schedule_timeout_uninterruptible(1);
- max_count--;
- }
/* release all resources */
spin_lock_irqsave(&pool->lock, flags);