drivers/net/wireless/{airo,ipw2100}: fix error handling bugs
airo: * fix oops, if !CONFIG_PROC_FS (create_proc_entry always returns NULL) * handle pci_register_driver() failure. if it fails, we really do want to exit, rather than (as a comment indicates) return success because-we-are-a-library. * #if 0 have_isa_dev variable, which is assigned a value but never used ipw2100: * handle sysfs_create_group() failure * handle driver_create_file() failure Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
@@ -6267,7 +6267,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 */
|
||||
@@ -6533,13 +6535,16 @@ 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;
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user