4 files changed, 55 insertions, 42 deletions

diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c
index 6ba066c41d2e..146ef00f94a3 100644
--- a/sound/drivers/dummy.c
+++ b/sound/drivers/dummy.c
@@ -808,8 +808,6 @@ static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)
         unsigned int idx;
         int err;
 
-        if (snd_BUG_ON(!dummy))
-                return -EINVAL;
         spin_lock_init(&dummy->mixer_lock);
         strcpy(card->mixername, "Dummy Mixer");
 
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index 6e7d09ae0e82..7d722a025d0d 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -29,6 +29,8 @@ extern char snd_opl3_regmap[MAX_OPL2_VOICES][4];
 
 extern int use_internal_drums;
 
+static void snd_opl3_note_off_unsafe(void *p, int note, int vel,
+                                     struct snd_midi_channel *chan);
 /*
  * The next table looks magical, but it certainly is not. Its values have
  * been calculated as table[i]=8*log(i/64)/log(2) with an obvious exception
@@ -242,16 +244,20 @@ void snd_opl3_timer_func(unsigned long data)
         int again = 0;
         int i;
 
-        spin_lock_irqsave(&opl3->sys_timer_lock, flags);
+        spin_lock_irqsave(&opl3->voice_lock, flags);
         for (i = 0; i < opl3->max_voices; i++) {
                 struct snd_opl3_voice *vp = &opl3->voices[i];
                 if (vp->state > 0 && vp->note_off_check) {
                         if (vp->note_off == jiffies)
-                                snd_opl3_note_off(opl3, vp->note, 0, vp->chan);
+                                snd_opl3_note_off_unsafe(opl3, vp->note, 0,
+                                                         vp->chan);
                         else
                                 again++;
                 }
         }
+        spin_unlock_irqrestore(&opl3->voice_lock, flags);
+
+        spin_lock_irqsave(&opl3->sys_timer_lock, flags);
         if (again) {
                 opl3->tlist.expires = jiffies + 1;      /* invoke again */
                 add_timer(&opl3->tlist);
@@ -658,15 +664,14 @@ static void snd_opl3_kill_voice(struct snd_opl3 *opl3, int voice)
 /*
  * Release a note in response to a midi note off.
  */
-void snd_opl3_note_off(void *p, int note, int vel, struct snd_midi_channel *chan)
+static void snd_opl3_note_off_unsafe(void *p, int note, int vel,
+                                     struct snd_midi_channel *chan)
 {
         struct snd_opl3 *opl3;
 
         int voice;
         struct snd_opl3_voice *vp;
 
-        unsigned long flags;
-
         opl3 = p;
 
 #ifdef DEBUG_MIDI
@@ -674,12 +679,9 @@ void snd_opl3_note_off(void *p, int note, int vel, struct snd_midi_channel *chan
                    chan->number, chan->midi_program, note);
 #endif
 
-        spin_lock_irqsave(&opl3->voice_lock, flags);
-
         if (opl3->synth_mode == SNDRV_OPL3_MODE_SEQ) {
                 if (chan->drum_channel && use_internal_drums) {
                         snd_opl3_drum_switch(opl3, note, vel, 0, chan);
-                        spin_unlock_irqrestore(&opl3->voice_lock, flags);
                         return;
                 }
                 /* this loop will hopefully kill all extra voices, because
@@ -697,6 +699,16 @@ void snd_opl3_note_off(void *p, int note, int vel, struct snd_midi_channel *chan
                         snd_opl3_kill_voice(opl3, voice);
                 }
         }
+}
+
+void snd_opl3_note_off(void *p, int note, int vel,
+                       struct snd_midi_channel *chan)
+{
+        struct snd_opl3 *opl3 = p;
+        unsigned long flags;
+
+        spin_lock_irqsave(&opl3->voice_lock, flags);
+        snd_opl3_note_off_unsafe(p, note, vel, chan);
         spin_unlock_irqrestore(&opl3->voice_lock, flags);
 }
 
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c
index 84cc2658c05b..e1145ac6e908 100644
--- a/sound/drivers/pcsp/pcsp_lib.c
+++ b/sound/drivers/pcsp/pcsp_lib.c
@@ -39,25 +39,20 @@ static DECLARE_TASKLET(pcsp_pcm_tasklet, pcsp_call_pcm_elapsed, 0);
 /* write the port and returns the next expire time in ns;
  * called at the trigger-start and in hrtimer callback
  */
-static unsigned long pcsp_timer_update(struct hrtimer *handle)
+static u64 pcsp_timer_update(struct snd_pcsp *chip)
 {
         unsigned char timer_cnt, val;
         u64 ns;
         struct snd_pcm_substream *substream;
         struct snd_pcm_runtime *runtime;
-        struct snd_pcsp *chip = container_of(handle, struct snd_pcsp, timer);
         unsigned long flags;
 
         if (chip->thalf) {
                 outb(chip->val61, 0x61);
                 chip->thalf = 0;
-                if (!atomic_read(&chip->timer_active))
-                        return 0;
                 return chip->ns_rem;
         }
 
-        if (!atomic_read(&chip->timer_active))
-                return 0;
         substream = chip->playback_substream;
         if (!substream)
                 return 0;
@@ -88,24 +83,17 @@ static unsigned long pcsp_timer_update(struct hrtimer *handle)
         return ns;
 }
 
-enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
+static void pcsp_pointer_update(struct snd_pcsp *chip)
 {
-        struct snd_pcsp *chip = container_of(handle, struct snd_pcsp, timer);
         struct snd_pcm_substream *substream;
-        int periods_elapsed, pointer_update;
         size_t period_bytes, buffer_bytes;
-        unsigned long ns;
+        int periods_elapsed;
         unsigned long flags;
 
-        pointer_update = !chip->thalf;
-        ns = pcsp_timer_update(handle);
-        if (!ns)
-                return HRTIMER_NORESTART;
-
         /* update the playback position */
         substream = chip->playback_substream;
         if (!substream)
-                return HRTIMER_NORESTART;
+                return;
 
         period_bytes = snd_pcm_lib_period_bytes(substream);
         buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
@@ -134,6 +122,26 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
 
         if (periods_elapsed)
                 tasklet_schedule(&pcsp_pcm_tasklet);
+}
+
+enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
+{
+        struct snd_pcsp *chip = container_of(handle, struct snd_pcsp, timer);
+        int pointer_update;
+        u64 ns;
+
+        if (!atomic_read(&chip->timer_active) || !chip->playback_substream)
+                return HRTIMER_NORESTART;
+
+        pointer_update = !chip->thalf;
+        ns = pcsp_timer_update(chip);
+        if (!ns) {
+                printk(KERN_WARNING "PCSP: unexpected stop\n");
+                return HRTIMER_NORESTART;
+        }
+
+        if (pointer_update)
+                pcsp_pointer_update(chip);
 
         hrtimer_forward(handle, hrtimer_get_expires(handle), ns_to_ktime(ns));
 
@@ -142,8 +150,6 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle)
 
 static int pcsp_start_playing(struct snd_pcsp *chip)
 {
-        unsigned long ns;
-
 #if PCSP_DEBUG
         printk(KERN_INFO "PCSP: start_playing called\n");
 #endif
@@ -159,11 +165,7 @@ static int pcsp_start_playing(struct snd_pcsp *chip)
         atomic_set(&chip->timer_active, 1);
         chip->thalf = 0;
 
-        ns = pcsp_timer_update(&pcsp_chip.timer);
-        if (!ns)
-                return -EIO;
-
-        hrtimer_start(&pcsp_chip.timer, ktime_set(0, ns), HRTIMER_MODE_REL);
+        hrtimer_start(&pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL);
         return 0;
 }
 
@@ -232,21 +234,22 @@ static int snd_pcsp_playback_hw_free(struct snd_pcm_substream *substream)
 static int snd_pcsp_playback_prepare(struct snd_pcm_substream *substream)
 {
         struct snd_pcsp *chip = snd_pcm_substream_chip(substream);
+        pcsp_sync_stop(chip);
+        chip->playback_ptr = 0;
+        chip->period_ptr = 0;
+        chip->fmt_size =
+                snd_pcm_format_physical_width(substream->runtime->format) >> 3;
+        chip->is_signed = snd_pcm_format_signed(substream->runtime->format);
 #if PCSP_DEBUG
         printk(KERN_INFO "PCSP: prepare called, "
-                        "size=%zi psize=%zi f=%zi f1=%i\n",
+                        "size=%zi psize=%zi f=%zi f1=%i fsize=%i\n",
                         snd_pcm_lib_buffer_bytes(substream),
                         snd_pcm_lib_period_bytes(substream),
                         snd_pcm_lib_buffer_bytes(substream) /
                         snd_pcm_lib_period_bytes(substream),
-                        substream->runtime->periods);
+                        substream->runtime->periods,
+                        chip->fmt_size);
 #endif
-        pcsp_sync_stop(chip);
-        chip->playback_ptr = 0;
-        chip->period_ptr = 0;
-        chip->fmt_size =
-                snd_pcm_format_physical_width(substream->runtime->format) >> 3;
-        chip->is_signed = snd_pcm_format_signed(substream->runtime->format);
         return 0;
 }
 
diff --git a/sound/drivers/pcsp/pcsp_mixer.c b/sound/drivers/pcsp/pcsp_mixer.c
index 199b03377142..903bc846763f 100644
--- a/sound/drivers/pcsp/pcsp_mixer.c
+++ b/sound/drivers/pcsp/pcsp_mixer.c
@@ -72,7 +72,7 @@ static int pcsp_treble_put(struct snd_kcontrol *kcontrol,
         if (treble != chip->treble) {
                 chip->treble = treble;
 #if PCSP_DEBUG
-                printk(KERN_INFO "PCSP: rate set to %i\n", PCSP_RATE());
+                printk(KERN_INFO "PCSP: rate set to %li\n", PCSP_RATE());
 #endif
                 changed = 1;
         }