Patch1:replace pci_find_device in avm_pci.c
Quoted 8 lines
Quoted 3 lines
dev_avm_cleanup:if (dev_avm) pci_dev_put(dev_avm);Same thing here, the check isn't needed.
Care to redo it with these minor fixes? Other than that, the logic looks correct.
Did the modifications and cleaned up white spaces as per your suggestions.
thanks.
Signed-off-by Surya Prabhakar <[email protected]>
---
drivers/isdn/hisax/avm_pci.c +12 -7
@@ -789,19 +789,19 @@ setup_avm_pcipnp(struct IsdnCard *card) }#endif #ifdef CONFIG_PCI -if ((dev_avm =pci_find_device (PCI_VENDOR_ID_AVM , +if ((dev_avm =pci_get_device (PCI_VENDOR_ID_AVM ,PCI_DEVICE_ID_AVM_A1 , dev_avm))) {if (pci_enable_device (dev_avm)) -return (0 ); + goto dev_avm_cleanup; cs->irq = dev_avm->irq;if (!cs->irq) {printk (KERN_ERR "FritzPCI: No IRQ for PCI card found\n" ); -return (0 ); + goto dev_avm_cleanup; } 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" ); -return (0 ); + goto dev_avm_cleanup; } cs->subtyp =AVM_FRITZ_PCI ; }else {
@@ -822,7 +822,7 @@ ready: CardType[card->typ], cs->hw.avm.cfg_reg, cs->hw.avm.cfg_reg + 31); -return (0 ); + goto dev_avm_cleanup; }switch (cs->subtyp) {case AVM_FRITZ_PCI :
@@ -841,8 +841,8 @@ ready: cs->BC_Write_Reg = &WriteHDLCPnP;break ;default : -printk (KERN_WARNING "AVM unknown subtype %d\n" , cs->subtyp); -return (0 ); +printk (KERN_WARNING "AVM unknown subtype %d\n" , cs->subtyp); + goto dev_avm_cleanup; } printk(KERN_INFO "HiSax: %s config irq:%d base:0x%X\n", (cs->subtyp = AVM_FRITZ_PCI) ? "AVM Fritz!PCI" : "AVM Fritz!PnP",
@@ -858,5 +858,10 @@ ready: cs->irq_func = &avm_pcipnp_interrupt; cs->writeisac (cs,ISAC_MASK ,0xFF );ISACVersion (cs, (cs->subtyp =AVM_FRITZ_PCI ) ?"AVM PCI:" :"AVM PnP:" ); +pci_dev_put (dev_avm);return (1 ); + +dev_avm_cleanup: +pci_dev_put (dev_avm); +return 0 ; }
Signature · 5 lines
surya. _______________________________________________ Kernel-janitors mailing list [email protected] https://lists.osdl.org/mailman/listinfo/kernel-janitors
Greg KH
Acked-by Greg Kroah-HartmanQuoted 10 lines · Surya
Quoted 9 lines
Quoted 4 lines
dev_avm_cleanup:if (dev_avm) pci_dev_put(dev_avm);Same thing here, the check isn't needed.
Care to redo it with these minor fixes? Other than that, the logic looks correct.
Quoted 6 lines
Did the modifications and cleaned up white spaces as per your suggestions.
thanks.
Signed-off-by Surya Prabhakar <[email protected]>
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors