Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
  [netdrvr] hp100: encapsulate all non-module code
  drivers/net/wireless/{airo,ipw2100}: fix error handling bugs
  [netdrvr] phy: Fix bugs in error handling
  [PATCH] spidernet: Use pci_dma_mapping_error()
  [PATCH] sky2: version 1.9
  [PATCH] sky2: fragmented receive for large MTU
  [PATCH] sky2: use netif_tx_lock instead of LLTX
  [PATCH] sky2: incremental transmit completion
  [PATCH] sky2: name irq after eth for irqbalance
  [PATCH] sky2: workarounds for some 88e806x chips
  [PATCH] sky2: use standard pci register capabilties for error register
  [PATCH] sky2: gigabit full duplex negotiation
  e100, e1000, ixgb: increment version numbers
  ixgb: convert to netdev_priv(netdev)
  ixgb: combine more rx descriptors to improve performance
  e1000: possible memory leak in e1000_set_ringparam
  e1000: Janitor: Use #defined values for literals
  e1000: don't strip vlan ID if 8021q claims it
  e1000: rework polarity, NVM, eeprom code and fixes.
  e1000: driver state fixes (race fix)
  ...

2 files changed, 27 insertions, 7 deletions

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index ba737c6cebec..39d09345027c 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -5659,25 +5659,40 @@ static int airo_pci_resume(struct pci_dev *pdev)
 
 static int __init airo_init_module( void )
 {
-        int i, have_isa_dev = 0;
+        int i;
+#if 0
+        int have_isa_dev = 0;
+#endif
 
         airo_entry = create_proc_entry("aironet",
                                        S_IFDIR | airo_perm,
                                        proc_root_driver);
-        airo_entry->uid = proc_uid;
-        airo_entry->gid = proc_gid;
+
+        if (airo_entry) {
+                airo_entry->uid = proc_uid;
+                airo_entry->gid = proc_gid;
+        }
 
         for( i = 0; i < 4 && io[i] && irq[i]; i++ ) {
                 airo_print_info("", "Trying to configure ISA adapter at irq=%d "
                         "io=0x%x", irq[i], io[i] );
                 if (init_airo_card( irq[i], io[i], 0, NULL ))
+#if 0
                         have_isa_dev = 1;
+#else
+                        /* do nothing */ ;
+#endif
         }
 
 #ifdef CONFIG_PCI
         airo_print_info("", "Probing for PCI adapters");
-        pci_register_driver(&airo_driver);
+        i = pci_register_driver(&airo_driver);
         airo_print_info("", "Finished probing for PCI adapters");
+
+        if (i) {
+                remove_proc_entry("aironet", proc_root_driver);
+                return i;
+        }
 #endif
 
         /* Always exit with success, as we are a library module
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index eddfa8786e83..599e2fe76188 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -6274,7 +6274,9 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev,
         IPW_DEBUG_INFO("%s: Bound to %s\n", dev->name, pci_name(pci_dev));
 
         /* perform this after register_netdev so that dev->name is set */
-        sysfs_create_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+        err = sysfs_create_group(&pci_dev->dev.kobj, &ipw2100_attribute_group);
+        if (err)
+                goto fail_unlock;
 
         /* If the RF Kill switch is disabled, go ahead and complete the
          * startup sequence */
@@ -6540,14 +6542,17 @@ static int __init ipw2100_init(void)
         printk(KERN_INFO DRV_NAME ": %s\n", DRV_COPYRIGHT);
 
         ret = pci_register_driver(&ipw2100_pci_driver);
+        if (ret)
+                goto out;
 
         set_acceptable_latency("ipw2100", INFINITE_LATENCY);
 #ifdef CONFIG_IPW2100_DEBUG
         ipw2100_debug_level = debug;
-        driver_create_file(&ipw2100_pci_driver.driver,
-                           &driver_attr_debug_level);
+        ret = driver_create_file(&ipw2100_pci_driver.driver,
+                                 &driver_attr_debug_level);
 #endif
 
+out:
         return ret;
 }