From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 25 Dec 2008 10:40:31 +0000 (+0100)
Subject: Merge branch 'topic/pcxhr-update' into to-push
X-Git-Tag: v2.6.29-rc1~590^2~3
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a9c3c7e04b9a744eafb2e87c770e7300bbffa375;p=linux-2.6-omap-h63xx.git

Merge branch 'topic/pcxhr-update' into to-push
---

a9c3c7e04b9a744eafb2e87c770e7300bbffa375
diff --cc sound/pci/pcxhr/pcxhr_core.c
index 4a5481f9781,d5f18226261..833e7180ad2
--- a/sound/pci/pcxhr/pcxhr_core.c
+++ b/sound/pci/pcxhr/pcxhr_core.c
@@@ -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)