Merge branch 'topic/pcxhr-update' into to-push
authorTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:31 +0000 (11:40 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 25 Dec 2008 10:40:31 +0000 (11:40 +0100)
1  2 
sound/pci/pcxhr/pcxhr.c
sound/pci/pcxhr/pcxhr_core.c

Simple merge
@@@ -1205,15 -1286,15 +1286,15 @@@ irqreturn_t pcxhr_interrupt(int irq, vo
        }
        /* other irq's handled in the tasklet */
        if (reg & PCXHR_IRQ_MASK) {
-               /* as we didn't request any notifications, some kind of xrun error
-                * will probably occured
-                */
-               /* better resynchronize all streams next interrupt : */
-               mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID;
-               
+               if (reg & PCXHR_IRQ_ASYNC) {
+                       /* as we didn't request any async notifications,
+                        * some kind of xrun error will probably occured
+                        */
+                       /* better resynchronize all streams next interrupt : */
+                       mgr->dsp_time_last = PCXHR_DSP_TIME_INVALID;
+               }
                mgr->src_it_dsp = reg;
 -              tasklet_hi_schedule(&mgr->msg_taskq);
 +              tasklet_schedule(&mgr->msg_taskq);
        }
  #ifdef CONFIG_SND_DEBUG_VERBOSE
        if (reg & PCXHR_FATAL_DSP_ERR)