Messages in this thread Patch in this message | | | Date | Tue, 28 Oct 2003 10:51:26 +0000 | From | Russell King <> | Subject | Re: [PATCH] Prevent PCI driver registration failure oopsing |
| |
On Tue, Oct 28, 2003 at 11:48:05AM +0100, Andreas Schwab wrote: > Russell King <rmk+lkml@arm.linux.org.uk> writes: > > + return rc < 0 ? : 0; > > Are you sure you want to return 1 if rc < 0?
Argh. Definitely not. Thanks for spotting that.
--- orig/include/linux/pci.h Thu Mar 13 14:24:56 2003 +++ linux/include/linux/pci.h Wed Mar 12 19:37:41 2003 @@ -768,26 +768,7 @@ { int rc = pci_register_driver (drv); - if (rc > 0) - return 0; - - /* iff CONFIG_HOTPLUG and built into kernel, we should - * leave the driver around for future hotplug events. - * For the module case, a hotplug daemon of some sort - * should load a module in response to an insert event. */ -#if defined(CONFIG_HOTPLUG) && !defined(MODULE) - if (rc == 0) - return 0; -#else - if (rc == 0) - rc = -ENODEV; -#endif - - /* if we get here, we need to clean up pci driver instance - * and return some sort of error */ - pci_unregister_driver (drv); - - return rc; + return rc < 0 ? rc : 0; } /*
-- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 PCMCIA - http://pcmcia.arm.linux.org.uk/ 2.6 Serial core - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |