Commit f0d63d81 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

[PATCH] 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.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6682fbac
......@@ -794,13 +794,13 @@ setup_avm_pcipnp(struct IsdnCard *card)
#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");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment