Index: cmpci.c
===================================================================
RCS file: /home/cltien/cvs/cmpci/cmpci.c,v
retrieving revision 6.65
retrieving revision 6.66
diff -a -u -r6.65 -r6.66
--- cmpci.c	29 Mar 2004 22:58:49 -0000	6.65
+++ cmpci.c	31 Mar 2004 17:42:08 -0000	6.66
@@ -1550,7 +1550,7 @@
 	spin_unlock(&s->lock);
 #ifdef CONFIG_SOUND_CMPCI_MIDI
 	if (intsrc & 0x00010000) {	// UART interrupt
-		if (intchk_mpu401((void *)s->midi_devc))
+		if (s->midi_devc && intchk_mpu401((void *)s->midi_devc))
 			mpuintr(irq, (void *)s->midi_devc, regs);
 		else
 			inb(s->iomidi);// dummy read
@@ -3071,6 +3071,7 @@
 	}
 #endif
 #ifdef CONFIG_SOUND_CMPCI_MIDI
+	s->midi_devc = 0;
 	/* disable MPU-401 */
 	maskb(s->iobase + CODEC_CMI_FUNCTRL1, ~0x04, 0);
 	s->mpu_data.name = "cmpci mpu";
@@ -3210,7 +3211,7 @@
 
 static int __init init_cmpci(void)
 {
-	printk(KERN_INFO "cmpci: version $Revision: 6.65 $ time " __TIME__ " " __DATE__ "\n");
+	printk(KERN_INFO "cmpci: version $Revision: 6.66 $ time " __TIME__ " " __DATE__ "\n");
 	return pci_module_init(&cm_driver);
 }