Merge branch 'topic/misc' into for-linus

3 files changed, 74 insertions, 6 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index a08ad57c49b6..5d98194bcad5 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -366,6 +366,70 @@ int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
 EXPORT_SYMBOL(snd_ctl_add);
 
 /**
+ * snd_ctl_replace - replace the control instance of the card
+ * @card: the card instance
+ * @kcontrol: the control instance to replace
+ * @add_on_replace: add the control if not already added
+ *
+ * Replaces the given control.  If the given control does not exist
+ * and the add_on_replace flag is set, the control is added.  If the
+ * control exists, it is destroyed first.
+ *
+ * Returns zero if successful, or a negative error code on failure.
+ *
+ * It frees automatically the control which cannot be added or replaced.
+ */
+int snd_ctl_replace(struct snd_card *card, struct snd_kcontrol *kcontrol,
+                    bool add_on_replace)
+{
+        struct snd_ctl_elem_id id;
+        unsigned int idx;
+        struct snd_kcontrol *old;
+        int ret;
+
+        if (!kcontrol)
+                return -EINVAL;
+        if (snd_BUG_ON(!card || !kcontrol->info)) {
+                ret = -EINVAL;
+                goto error;
+        }
+        id = kcontrol->id;
+        down_write(&card->controls_rwsem);
+        old = snd_ctl_find_id(card, &id);
+        if (!old) {
+                if (add_on_replace)
+                        goto add;
+                up_write(&card->controls_rwsem);
+                ret = -EINVAL;
+                goto error;
+        }
+        ret = snd_ctl_remove(card, old);
+        if (ret < 0) {
+                up_write(&card->controls_rwsem);
+                goto error;
+        }
+add:
+        if (snd_ctl_find_hole(card, kcontrol->count) < 0) {
+                up_write(&card->controls_rwsem);
+                ret = -ENOMEM;
+                goto error;
+        }
+        list_add_tail(&kcontrol->list, &card->controls);
+        card->controls_count += kcontrol->count;
+        kcontrol->id.numid = card->last_numid + 1;
+        card->last_numid += kcontrol->count;
+        up_write(&card->controls_rwsem);
+        for (idx = 0; idx < kcontrol->count; idx++, id.index++, id.numid++)
+                snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
+        return 0;
+
+error:
+        snd_ctl_free_one(kcontrol);
+        return ret;
+}
+EXPORT_SYMBOL(snd_ctl_replace);
+
+/**
  * snd_ctl_remove - remove the control from the card and release it
  * @card: the card instance
  * @kcontrol: the control instance to remove
diff --git a/sound/core/init.c b/sound/core/init.c
index a0080aa45ae9..30ecad41403c 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -514,7 +514,7 @@ static void snd_card_set_id_no_lock(struct snd_card *card, const char *nid)
         id = card->id;
         
         if (*id == '\0')
-                strcpy(id, "default");
+                strcpy(id, "Default");
 
         while (1) {
                 if (loops-- == 0) {
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 64449cb8f873..abfeff1611ce 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -189,6 +189,7 @@ static void xrun(struct snd_pcm_substream *substream)
 #define XRUN_LOG_CNT    10
 
 struct hwptr_log_entry {
+        unsigned int in_interrupt;
         unsigned long jiffies;
         snd_pcm_uframes_t pos;
         snd_pcm_uframes_t period_size;
@@ -204,7 +205,7 @@ struct snd_pcm_hwptr_log {
 };
 
 static void xrun_log(struct snd_pcm_substream *substream,
-                     snd_pcm_uframes_t pos)
+                     snd_pcm_uframes_t pos, int in_interrupt)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_pcm_hwptr_log *log = runtime->hwptr_log;
@@ -220,6 +221,7 @@ static void xrun_log(struct snd_pcm_substream *substream,
                         return;
         }
         entry = &log->entries[log->idx];
+        entry->in_interrupt = in_interrupt;
         entry->jiffies = jiffies;
         entry->pos = pos;
         entry->period_size = runtime->period_size;
@@ -246,9 +248,11 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
                 entry = &log->entries[idx];
                 if (entry->period_size == 0)
                         break;
-                snd_printd("hwptr log: %s: j=%lu, pos=%ld/%ld/%ld, "
+                snd_printd("hwptr log: %s: %sj=%lu, pos=%ld/%ld/%ld, "
                            "hwptr=%ld/%ld\n",
-                           name, entry->jiffies, (unsigned long)entry->pos,
+                           name, entry->in_interrupt ? "[Q] " : "",
+                           entry->jiffies,
+                           (unsigned long)entry->pos,
                            (unsigned long)entry->period_size,
                            (unsigned long)entry->buffer_size,
                            (unsigned long)entry->old_hw_ptr,
@@ -262,7 +266,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream)
 #else /* ! CONFIG_SND_PCM_XRUN_DEBUG */
 
 #define hw_ptr_error(substream, fmt, args...) do { } while (0)
-#define xrun_log(substream, pos)        do { } while (0)
+#define xrun_log(substream, pos, in_interrupt)  do { } while (0)
 #define xrun_log_show(substream)        do { } while (0)
 
 #endif
@@ -326,7 +330,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
         }
         pos -= pos % runtime->min_align;
         if (xrun_debug(substream, XRUN_DEBUG_LOG))
-                xrun_log(substream, pos);
+                xrun_log(substream, pos, in_interrupt);
         hw_base = runtime->hw_ptr_base;
         new_hw_ptr = hw_base + pos;
         if (in_interrupt) {