[PATCH] hisax: don't look at pci_dev->irq before calling pci_enable_device()

[Bjorn Helgaas <bjorn.helgaas@hp.com>]

[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

The hisax driver looks at dev_avm->irq before calling pci_enable_device(),
which means it requests the wrong IRQ.  This patch fixes it.

Thanks to Thorsten Doil for reporting the problem and testing the fix.

[-- Attachment #2: hisax-irq.patch --]
[-- Type: text/x-diff, Size: 961 bytes --]

The hisax driver looks at dev_avm->irq before calling pci_enable_device(),
which means it requests the wrong IRQ.  This patch fixes it.

Thanks to Thorsten Doil for reporting the problem and testing the fix.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>

===== drivers/isdn/hisax/avm_pci.c 1.48 vs edited =====
--- 1.48/drivers/isdn/hisax/avm_pci.c	2004-08-24 03:08:30 -06:00
+++ edited/drivers/isdn/hisax/avm_pci.c	2004-12-09 13:26:25 -07:00
@@ -794,13 +794,13 @@
 #ifdef CONFIG_PCI
 	if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM,
 		PCI_DEVICE_ID_AVM_A1,  dev_avm))) {
+		if (pci_enable_device(dev_avm))
+			return(0);
 		cs->irq = dev_avm->irq;
 		if (!cs->irq) {
 			printk(KERN_ERR "FritzPCI: No IRQ for PCI card found\n");
 			return(0);
 		}
-		if (pci_enable_device(dev_avm))
-			return(0);
 		cs->hw.avm.cfg_reg = pci_resource_start(dev_avm, 1);
 		if (!cs->hw.avm.cfg_reg) {
 			printk(KERN_ERR "FritzPCI: No IO-Adr for PCI card found\n");