Merge airlied/drm-next into drm-misc-next

Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

2 files changed, 21 insertions, 21 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);
diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
index 0bec02e89d51..450c5187eecb 100644
--- a/sound/core/seq/seq_queue.c
+++ b/sound/core/seq/seq_queue.c
@@ -181,6 +181,8 @@ void __exit snd_seq_queues_delete(void)
         }
 }
 
+static void queue_use(struct snd_seq_queue *queue, int client, int use);
+
 /* allocate a new queue -
  * return queue index value or negative value for error
  */
@@ -192,11 +194,11 @@ int snd_seq_queue_alloc(int client, int locked, unsigned int info_flags)
         if (q == NULL)
                 return -ENOMEM;
         q->info_flags = info_flags;
+        queue_use(q, client, 1);
         if (queue_list_add(q) < 0) {
                 queue_delete(q);
                 return -ENOMEM;
         }
-        snd_seq_queue_use(q->queue, client, 1); /* use this queue */
         return q->queue;
 }
 
@@ -502,19 +504,9 @@ int snd_seq_queue_timer_set_tempo(int queueid, int client,
         return result;
 }
 
-
-/* use or unuse this queue -
- * if it is the first client, starts the timer.
- * if it is not longer used by any clients, stop the timer.
- */
-int snd_seq_queue_use(int queueid, int client, int use)
+/* use or unuse this queue */
+static void queue_use(struct snd_seq_queue *queue, int client, int use)
 {
-        struct snd_seq_queue *queue;
-
-        queue = queueptr(queueid);
-        if (queue == NULL)
-                return -EINVAL;
-        mutex_lock(&queue->timer_mutex);
         if (use) {
                 if (!test_and_set_bit(client, queue->clients_bitmap))
                         queue->clients++;
@@ -529,6 +521,21 @@ int snd_seq_queue_use(int queueid, int client, int use)
         } else {
                 snd_seq_timer_close(queue);
         }
+}
+
+/* use or unuse this queue -
+ * if it is the first client, starts the timer.
+ * if it is not longer used by any clients, stop the timer.
+ */
+int snd_seq_queue_use(int queueid, int client, int use)
+{
+        struct snd_seq_queue *queue;
+
+        queue = queueptr(queueid);
+        if (queue == NULL)
+                return -EINVAL;
+        mutex_lock(&queue->timer_mutex);
+        queue_use(queue, client, use);
         mutex_unlock(&queue->timer_mutex);
         queuefree(queue);
         return 0;