Skip to contentSkip to conversation

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

PATCH New Bjorn Helgaas 1 participant 1 message Dec 13, 2004

lore
Share & tools
lore
#0 lore raw

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

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.

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.

===== drivers/isdn/hisax/avm_pci.c 1.48 vs edited =====

drivers/isdn/hisax/avm_pci.c +2 -2
@@ -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");