This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / isdn / hisax / hisax_fcpcipnp.c

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 987d441..98c408e 100644 (file)
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -996,18 +996,28 @@ static struct pci_driver fcpci_driver = {
 
 static int __init hisax_fcpcipnp_init(void)
 {
-       int retval;
+       int retval, pci_nr_found;
 
        printk(KERN_INFO "hisax_fcpcipnp: Fritz!Card PCI/PCIv2/PnP ISDN driver v0.0.1\n");
 
        retval = pci_register_driver(&fcpci_driver);
-       if (retval)
+       if (retval < 0)
                goto out;
+       pci_nr_found = retval;
+       retval = 0;
+
 #ifdef __ISAPNP__
        retval = pnp_register_driver(&fcpnp_driver);
        if (retval < 0)
                goto out_unregister_pci;
 #endif
+
+#if !defined(CONFIG_HOTPLUG) || defined(MODULE)
+       if (pci_nr_found + retval == 0) {
+               retval = -ENODEV;
+               goto out_unregister_isapnp;
+       }
+#endif
        return 0;
 
 #if !defined(CONFIG_HOTPLUG) || defined(MODULE)