git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
sound
/
pci
/
emu10k1
/
irq.c
diff --git
a/sound/pci/emu10k1/irq.c
b/sound/pci/emu10k1/irq.c
index
e960828
..
70f4020
100644
(file)
--- a/
sound/pci/emu10k1/irq.c
+++ b/
sound/pci/emu10k1/irq.c
@@
-112,8
+112,8
@@
irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
status &= ~(IPR_A_MIDITRANSBUFEMPTY2|IPR_A_MIDIRECVBUFEMPTY2);
}
if (status & IPR_INTERVALTIMER) {
status &= ~(IPR_A_MIDITRANSBUFEMPTY2|IPR_A_MIDIRECVBUFEMPTY2);
}
if (status & IPR_INTERVALTIMER) {
- if (emu->timer
_interrupt
)
-
emu->timer_interrupt(emu
);
+ if (emu->timer)
+
snd_timer_interrupt(emu->timer, emu->timer->sticks
);
else
snd_emu10k1_intr_disable(emu, INTE_INTERVALTIMERENB);
status &= ~IPR_INTERVALTIMER;
else
snd_emu10k1_intr_disable(emu, INTE_INTERVALTIMERENB);
status &= ~IPR_INTERVALTIMER;