Messages in this thread Patch in this message | | | Date | Wed, 14 Feb 2001 10:53:32 +0000 | From | Tim Waugh <> | Subject | Re: [patch] 2.4.2-pre3: parport_pc init_module bug |
| |
On Wed, Feb 14, 2001 at 02:03:07AM -0600, Jeff Garzik wrote:
> If pci_register_driver returns < 0, the driver is not registered with > the system.
Thanks. Okay, second try:
2001-01-14 Tim Waugh <twaugh@redhat.com>
* parport_pc.c: Fix PCI driver list corruption on unsuccessful module load (Andrew Morton).
--- linux/drivers/parport/parport_pc.c.init Wed Feb 14 10:49:28 2001 +++ linux/drivers/parport/parport_pc.c Wed Feb 14 10:50:31 2001 @@ -89,6 +89,7 @@ } superios[NR_SUPERIOS] __devinitdata = { {0,},}; static int user_specified __devinitdata = 0; +static int registered_parport; /* frob_control, but for ECR */ static void frob_econtrol (struct parport *pb, unsigned char m, @@ -2605,8 +2606,10 @@ count += parport_pc_find_nonpci_ports (autoirq, autodma); r = pci_register_driver (&parport_pc_pci_driver); - if (r > 0) + if (r >= 0) { + registered_parport = 1; count += r; + } return count; } @@ -2667,6 +2670,7 @@ /* Work out how many ports we have, then get parport_share to parse the irq values. */ unsigned int i; + int ret; for (i = 0; i < PARPORT_PC_MAX_PORTS && io[i]; i++); if (i) { if (parport_parse_irqs(i, irq, irqval)) return 1; @@ -2691,7 +2695,11 @@ } } - return !parport_pc_init (io, io_hi, irqval, dmaval); + ret = !parport_pc_init (io, io_hi, irqval, dmaval); + if (ret && registered_parport) + pci_unregister_driver (&parport_pc_pci_driver); + + return ret; } void cleanup_module(void) *** linux/drivers/parport/ChangeLog.init Fri Jan 5 10:41:52 2001 --- linux/drivers/parport/ChangeLog Wed Feb 14 10:50:00 2001 *************** *** 0 **** --- 1,7 ---- + 2001-02-14 Andrew Morton <andrewm@uow.edu.au> + + * parport_pc.c (registered_parport): New static variable. + (parport_pc_find_ports): Set it when we register PCI driver. + (init_module): Unregister PCI driver if necessary when we + fail. +
Tim. */ - 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/
| |