summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2006-07-23 13:59:44 +0100
committerJaroslav Kysela <perex@suse.cz>2006-08-03 15:21:16 +0200
commitfb6a0d635d4ff6b3555179d0154981f03427071a (patch)
tree6a0badf55efb07f4c0133869b74402970b4716ba
parent46f5960fdbf359f0c75989854bbaebc1de7a1eb4 (diff)
downloadlinux-fb6a0d635d4ff6b3555179d0154981f03427071a.tar.gz
linux-fb6a0d635d4ff6b3555179d0154981f03427071a.tar.bz2
linux-fb6a0d635d4ff6b3555179d0154981f03427071a.zip
[ALSA] snd-emu10k1: Fixes ALSA bug#2190
Fixes ALSA bug#2190 System hangs on unplugging Audigy 2 ZS Notebook CardBus card. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
-rw-r--r--sound/pci/emu10k1/irq.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/irq.c b/sound/pci/emu10k1/irq.c
index a8b31286b6db..1076af4c3669 100644
--- a/sound/pci/emu10k1/irq.c
+++ b/sound/pci/emu10k1/irq.c
@@ -37,9 +37,13 @@ irqreturn_t snd_emu10k1_interrupt(int irq, void *dev_id, struct pt_regs *regs)
int handled = 0;
while ((status = inl(emu->port + IPR)) != 0) {
- //printk("emu10k1 irq - status = 0x%x\n", status);
+ //snd_printk(KERN_INFO "emu10k1 irq - status = 0x%x\n", status);
orig_status = status;
handled = 1;
+ if ((status & 0xffffffff) == 0xffffffff) {
+ snd_printk(KERN_INFO "snd-emu10k1: Suspected sound card removal\n");
+ break;
+ }
if (status & IPR_PCIERROR) {
snd_printk(KERN_ERR "interrupt: PCI error\n");
snd_emu10k1_intr_disable(emu, INTE_PCIERRORENABLE);