1 files changed, 14 insertions, 12 deletions

diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index c850345c43b5..5847c4475bf3 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -414,32 +414,33 @@ int snd_seq_pool_init(struct snd_seq_pool *pool)
         return 0;
 }
 
+/* refuse the further insertion to the pool */
+void snd_seq_pool_mark_closing(struct snd_seq_pool *pool)
+{
+        unsigned long flags;
+
+        if (snd_BUG_ON(!pool))
+                return;
+        spin_lock_irqsave(&pool->lock, flags);
+        pool->closing = 1;
+        spin_unlock_irqrestore(&pool->lock, flags);
+}
+
 /* remove events */
 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;
 
         /* wait for closing all threads */
-        spin_lock_irqsave(&pool->lock, flags);
-        pool->closing = 1;
-        spin_unlock_irqrestore(&pool->lock, flags);
-
         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);
@@ -491,6 +492,7 @@ int snd_seq_pool_delete(struct snd_seq_pool **ppool)
         *ppool = NULL;
         if (pool == NULL)
                 return 0;
+        snd_seq_pool_mark_closing(pool);
         snd_seq_pool_done(pool);
         kfree(pool);
         return 0;