Merge branch 'topic/misc' into for-linus

7 files changed, 77 insertions, 9 deletions

diff --git a/sound/core/control.c b/sound/core/control.c
index 45a818002d99..9ce00ed20fba 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1488,7 +1488,7 @@ int snd_ctl_create(struct snd_card *card)
 }
 
 /*
- * Frequently used control callbacks
+ * Frequently used control callbacks/helpers
  */
 int snd_ctl_boolean_mono_info(struct snd_kcontrol *kcontrol,
                               struct snd_ctl_elem_info *uinfo)
@@ -1513,3 +1513,29 @@ int snd_ctl_boolean_stereo_info(struct snd_kcontrol *kcontrol,
 }
 
 EXPORT_SYMBOL(snd_ctl_boolean_stereo_info);
+
+/**
+ * snd_ctl_enum_info - fills the info structure for an enumerated control
+ * @info: the structure to be filled
+ * @channels: the number of the control's channels; often one
+ * @items: the number of control values; also the size of @names
+ * @names: an array containing the names of all control values
+ *
+ * Sets all required fields in @info to their appropriate values.
+ * If the control's accessibility is not the default (readable and writable),
+ * the caller has to fill @info->access.
+ */
+int snd_ctl_enum_info(struct snd_ctl_elem_info *info, unsigned int channels,
+                      unsigned int items, const char *const names[])
+{
+        info->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
+        info->count = channels;
+        info->value.enumerated.items = items;
+        if (info->value.enumerated.item >= items)
+                info->value.enumerated.item = items - 1;
+        strlcpy(info->value.enumerated.name,
+                names[info->value.enumerated.item],
+                sizeof(info->value.enumerated.name));
+        return 0;
+}
+EXPORT_SYMBOL(snd_ctl_enum_info);
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index b753ec661fcf..a2e4eb324699 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -453,8 +453,10 @@ static int snd_pcm_hw_param_near(struct snd_pcm_substream *pcm,
         } else {
                 *params = *save;
                 max = snd_pcm_hw_param_max(pcm, params, var, max, &maxdir);
-                if (max < 0)
+                if (max < 0) {
+                        kfree(save);
                         return max;
+                }
                 last = 1;
         }
  _end:
diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
index 11446a1506da..a82e3756a72d 100644
--- a/sound/core/pcm_lib.c
+++ b/sound/core/pcm_lib.c
@@ -373,6 +373,27 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
                            (unsigned long)new_hw_ptr,
                            (unsigned long)runtime->hw_ptr_base);
         }
+
+        if (runtime->no_period_wakeup) {
+                /*
+                 * Without regular period interrupts, we have to check
+                 * the elapsed time to detect xruns.
+                 */
+                jdelta = jiffies - runtime->hw_ptr_jiffies;
+                if (jdelta < runtime->hw_ptr_buffer_jiffies / 2)
+                        goto no_delta_check;
+                hdelta = jdelta - delta * HZ / runtime->rate;
+                while (hdelta > runtime->hw_ptr_buffer_jiffies / 2 + 1) {
+                        delta += runtime->buffer_size;
+                        hw_base += runtime->buffer_size;
+                        if (hw_base >= runtime->boundary)
+                                hw_base = 0;
+                        new_hw_ptr = hw_base + pos;
+                        hdelta -= runtime->hw_ptr_buffer_jiffies;
+                }
+                goto no_delta_check;
+        }
+
         /* something must be really wrong */
         if (delta >= runtime->buffer_size + runtime->period_size) {
                 hw_ptr_error(substream,
@@ -442,6 +463,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream,
                              (long)old_hw_ptr);
         }
 
+ no_delta_check:
         if (runtime->status->hw_ptr == new_hw_ptr)
                 return 0;
 
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index e82c1f97d99e..0db714e87a80 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -422,6 +422,9 @@ static int snd_pcm_hw_params(struct snd_pcm_substream *substream,
         runtime->info = params->info;
         runtime->rate_num = params->rate_num;
         runtime->rate_den = params->rate_den;
+        runtime->no_period_wakeup =
+                        (params->info & SNDRV_PCM_INFO_NO_PERIOD_WAKEUP) &&
+                        (params->flags & SNDRV_PCM_HW_PARAMS_NO_PERIOD_WAKEUP);
 
         bits = snd_pcm_format_physical_width(runtime->format);
         runtime->sample_bits = bits;
diff --git a/sound/core/seq/seq.c b/sound/core/seq/seq.c
index bf09a5ad1865..119fddb6fc99 100644
--- a/sound/core/seq/seq.c
+++ b/sound/core/seq/seq.c
@@ -32,6 +32,7 @@
 #include "seq_timer.h"
 #include "seq_system.h"
 #include "seq_info.h"
+#include <sound/minors.h>
 #include <sound/seq_device.h>
 
 #if defined(CONFIG_SND_SEQ_DUMMY_MODULE)
@@ -73,6 +74,9 @@ MODULE_PARM_DESC(seq_default_timer_subdevice, "The default timer subdevice numbe
 module_param(seq_default_timer_resolution, int, 0644);
 MODULE_PARM_DESC(seq_default_timer_resolution, "The default timer resolution in Hz.");
 
+MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR, SNDRV_MINOR_SEQUENCER);
+MODULE_ALIAS("devname:snd/seq");
+
 /*
  *  INIT PART
  */
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 66691fe437e6..1c7a3efe1778 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -188,14 +188,22 @@ static const struct file_operations snd_fops =
 };
 
 #ifdef CONFIG_SND_DYNAMIC_MINORS
-static int snd_find_free_minor(void)
+static int snd_find_free_minor(int type)
 {
         int minor;
 
+        /* static minors for module auto loading */
+        if (type == SNDRV_DEVICE_TYPE_SEQUENCER)
+                return SNDRV_MINOR_SEQUENCER;
+        if (type == SNDRV_DEVICE_TYPE_TIMER)
+                return SNDRV_MINOR_TIMER;
+
         for (minor = 0; minor < ARRAY_SIZE(snd_minors); ++minor) {
-                /* skip minors still used statically for autoloading devices */
-                if (SNDRV_MINOR_DEVICE(minor) == SNDRV_MINOR_CONTROL ||
-                    minor == SNDRV_MINOR_SEQUENCER)
+                /* skip static minors still used for module auto loading */
+                if (SNDRV_MINOR_DEVICE(minor) == SNDRV_MINOR_CONTROL)
+                        continue;
+                if (minor == SNDRV_MINOR_SEQUENCER ||
+                    minor == SNDRV_MINOR_TIMER)
                         continue;
                 if (!snd_minors[minor])
                         return minor;
@@ -269,7 +277,7 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
         preg->private_data = private_data;
         mutex_lock(&sound_mutex);
 #ifdef CONFIG_SND_DYNAMIC_MINORS
-        minor = snd_find_free_minor();
+        minor = snd_find_free_minor(type);
 #else
         minor = snd_kernel_minor(type, card, dev);
         if (minor >= 0 && snd_minors[minor])
diff --git a/sound/core/timer.c b/sound/core/timer.c
index 13afb60999b9..ed016329e911 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -34,8 +34,8 @@
 #include <sound/initval.h>
 #include <linux/kmod.h>
 
-#if defined(CONFIG_SND_HPET) || defined(CONFIG_SND_HPET_MODULE)
-#define DEFAULT_TIMER_LIMIT 3
+#if defined(CONFIG_SND_HRTIMER) || defined(CONFIG_SND_HRTIMER_MODULE)
+#define DEFAULT_TIMER_LIMIT 4
 #elif defined(CONFIG_SND_RTCTIMER) || defined(CONFIG_SND_RTCTIMER_MODULE)
 #define DEFAULT_TIMER_LIMIT 2
 #else
@@ -52,6 +52,9 @@ MODULE_PARM_DESC(timer_limit, "Maximum global timers in system.");
 module_param(timer_tstamp_monotonic, int, 0444);
 MODULE_PARM_DESC(timer_tstamp_monotonic, "Use posix monotonic clock source for timestamps (default).");
 
+MODULE_ALIAS_CHARDEV(CONFIG_SND_MAJOR, SNDRV_MINOR_TIMER);
+MODULE_ALIAS("devname:snd/timer");
+
 struct snd_timer_user {
         struct snd_timer_instance *timeri;
         int tread;              /* enhanced read with timestamps and events */