patch-2.3.99-pre7 linux/drivers/sound/esssolo1.c
Next file: linux/drivers/sound/i810_audio.c
Previous file: linux/drivers/sound/es1371.c
Back to the patch index
Back to the overall index
-  Lines: 14
-  Date:
Fri Apr 28 23:00:04 2000
-  Orig file: 
v2.3.99-pre6/linux/drivers/sound/esssolo1.c
-  Orig date: 
Wed Apr 26 16:34:08 2000
diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/sound/esssolo1.c linux/drivers/sound/esssolo1.c
@@ -2252,11 +2252,12 @@
 		printk(KERN_ERR "solo1: io ports in use\n");
 		goto err_region4;
 	}
+	if (pci_enable_device(pcidev))
+		goto err_irq;
 	if (request_irq(s->irq, solo1_interrupt, SA_SHIRQ, "ESS Solo1", s)) {
 		printk(KERN_ERR "solo1: irq %u in use\n", s->irq);
 		goto err_irq;
 	}
-	pci_enable_device(pcidev);
 	printk(KERN_DEBUG "solo1: ddma base address: 0x%lx\n", s->ddmabase);
 	printk(KERN_INFO "solo1: joystick port at %#lx\n", s->gpbase+1);
 	/* register devices */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)