Merge branch 'topic/core-fixes' into for-linus

2 files changed, 39 insertions, 38 deletions

diff --git a/sound/core/timer.c b/sound/core/timer.c
index 9b513a05765a..dca817fc7894 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -422,7 +422,7 @@ static void snd_timer_notify1(struct snd_timer_instance *ti, int event)
         spin_lock_irqsave(&timer->lock, flags);
         list_for_each_entry(ts, &ti->slave_active_head, active_list)
                 if (ts->ccallback)
-                        ts->ccallback(ti, event + 100, &tstamp, resolution);
+                        ts->ccallback(ts, event + 100, &tstamp, resolution);
         spin_unlock_irqrestore(&timer->lock, flags);
 }
 
@@ -518,9 +518,13 @@ static int _snd_timer_stop(struct snd_timer_instance *timeri, int event)
                         spin_unlock_irqrestore(&slave_active_lock, flags);
                         return -EBUSY;
                 }
+                if (timeri->timer)
+                        spin_lock(&timeri->timer->lock);
                 timeri->flags &= ~SNDRV_TIMER_IFLG_RUNNING;
                 list_del_init(&timeri->ack_list);
                 list_del_init(&timeri->active_list);
+                if (timeri->timer)
+                        spin_unlock(&timeri->timer->lock);
                 spin_unlock_irqrestore(&slave_active_lock, flags);
                 goto __end;
         }
@@ -1929,6 +1933,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
 {
         struct snd_timer_user *tu;
         long result = 0, unit;
+        int qhead;
         int err = 0;
 
         tu = file->private_data;
@@ -1940,7 +1945,7 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
 
                         if ((file->f_flags & O_NONBLOCK) != 0 || result > 0) {
                                 err = -EAGAIN;
-                                break;
+                                goto _error;
                         }
 
                         set_current_state(TASK_INTERRUPTIBLE);
@@ -1955,42 +1960,37 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
 
                         if (tu->disconnected) {
                                 err = -ENODEV;
-                                break;
+                                goto _error;
                         }
                         if (signal_pending(current)) {
                                 err = -ERESTARTSYS;
-                                break;
+                                goto _error;
                         }
                 }
 
+                qhead = tu->qhead++;
+                tu->qhead %= tu->queue_size;
                 spin_unlock_irq(&tu->qlock);
-                if (err < 0)
-                        goto _error;
 
                 if (tu->tread) {
-                        if (copy_to_user(buffer, &tu->tqueue[tu->qhead++],
-                                         sizeof(struct snd_timer_tread))) {
+                        if (copy_to_user(buffer, &tu->tqueue[qhead],
+                                         sizeof(struct snd_timer_tread)))
                                 err = -EFAULT;
-                                goto _error;
-                        }
                 } else {
-                        if (copy_to_user(buffer, &tu->queue[tu->qhead++],
-                                         sizeof(struct snd_timer_read))) {
+                        if (copy_to_user(buffer, &tu->queue[qhead],
+                                         sizeof(struct snd_timer_read)))
                                 err = -EFAULT;
-                                goto _error;
-                        }
                 }
 
-                tu->qhead %= tu->queue_size;
-
-                result += unit;
-                buffer += unit;
-
                 spin_lock_irq(&tu->qlock);
                 tu->qused--;
+                if (err < 0)
+                        goto _error;
+                result += unit;
+                buffer += unit;
         }
-        spin_unlock_irq(&tu->qlock);
  _error:
+        spin_unlock_irq(&tu->qlock);
         return result > 0 ? result : err;
 }
 
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index bde33308f0d6..c0f8f613f1f1 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -87,7 +87,7 @@ MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-128) for dummy driver.");
 module_param(fake_buffer, bool, 0444);
 MODULE_PARM_DESC(fake_buffer, "Fake buffer allocations.");
 #ifdef CONFIG_HIGH_RES_TIMERS
-module_param(hrtimer, bool, 0444);
+module_param(hrtimer, bool, 0644);
 MODULE_PARM_DESC(hrtimer, "Use hrtimer as the timer source.");
 #endif
 
@@ -109,6 +109,9 @@ struct dummy_timer_ops {
         snd_pcm_uframes_t (*pointer)(struct snd_pcm_substream *);
 };
 
+#define get_dummy_ops(substream) \
+        (*(const struct dummy_timer_ops **)(substream)->runtime->private_data)
+
 struct dummy_model {
         const char *name;
         int (*playback_constraints)(struct snd_pcm_runtime *runtime);
@@ -137,7 +140,6 @@ struct snd_dummy {
         int iobox;
         struct snd_kcontrol *cd_volume_ctl;
         struct snd_kcontrol *cd_switch_ctl;
-        const struct dummy_timer_ops *timer_ops;
 };
 
 /*
@@ -231,6 +233,8 @@ static struct dummy_model *dummy_models[] = {
  */
 
 struct dummy_systimer_pcm {
+        /* ops must be the first item */
+        const struct dummy_timer_ops *timer_ops;
         spinlock_t lock;
         struct timer_list timer;
         unsigned long base_time;
@@ -366,6 +370,8 @@ static const struct dummy_timer_ops dummy_systimer_ops = {
  */
 
 struct dummy_hrtimer_pcm {
+        /* ops must be the first item */
+        const struct dummy_timer_ops *timer_ops;
         ktime_t base_time;
         ktime_t period_time;
         atomic_t running;
@@ -492,31 +498,25 @@ static const struct dummy_timer_ops dummy_hrtimer_ops = {
 
 static int dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-
         switch (cmd) {
         case SNDRV_PCM_TRIGGER_START:
         case SNDRV_PCM_TRIGGER_RESUME:
-                return dummy->timer_ops->start(substream);
+                return get_dummy_ops(substream)->start(substream);
         case SNDRV_PCM_TRIGGER_STOP:
         case SNDRV_PCM_TRIGGER_SUSPEND:
-                return dummy->timer_ops->stop(substream);
+                return get_dummy_ops(substream)->stop(substream);
         }
         return -EINVAL;
 }
 
 static int dummy_pcm_prepare(struct snd_pcm_substream *substream)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-
-        return dummy->timer_ops->prepare(substream);
+        return get_dummy_ops(substream)->prepare(substream);
 }
 
 static snd_pcm_uframes_t dummy_pcm_pointer(struct snd_pcm_substream *substream)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-
-        return dummy->timer_ops->pointer(substream);
+        return get_dummy_ops(substream)->pointer(substream);
 }
 
 static struct snd_pcm_hardware dummy_pcm_hardware = {
@@ -562,17 +562,19 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream)
         struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
         struct dummy_model *model = dummy->model;
         struct snd_pcm_runtime *runtime = substream->runtime;
+        const struct dummy_timer_ops *ops;
         int err;
 
-        dummy->timer_ops = &dummy_systimer_ops;
+        ops = &dummy_systimer_ops;
 #ifdef CONFIG_HIGH_RES_TIMERS
         if (hrtimer)
-                dummy->timer_ops = &dummy_hrtimer_ops;
+                ops = &dummy_hrtimer_ops;
 #endif
 
-        err = dummy->timer_ops->create(substream);
+        err = ops->create(substream);
         if (err < 0)
                 return err;
+        get_dummy_ops(substream) = ops;
 
         runtime->hw = dummy->pcm_hw;
         if (substream->pcm->device & 1) {
@@ -594,7 +596,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream)
                         err = model->capture_constraints(substream->runtime);
         }
         if (err < 0) {
-                dummy->timer_ops->free(substream);
+                get_dummy_ops(substream)->free(substream);
                 return err;
         }
         return 0;
@@ -602,8 +604,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream)
 
 static int dummy_pcm_close(struct snd_pcm_substream *substream)
 {
-        struct snd_dummy *dummy = snd_pcm_substream_chip(substream);
-        dummy->timer_ops->free(substream);
+        get_dummy_ops(substream)->free(substream);
         return 0;
 }