Commit b08b5ad9 authored Jun 23, 2007 by Ingo Korb Committed by Linus Torvalds Jun 24, 2007

Char: stallion, fix oops during init with ISA cards



The stallion driver oopses while initializing ISA cards due to an
uninitialized variable.  This patch changes the initialisation order to
match the PCI code path.

Signed-off-by: Ingo Korb <ml@akana.de>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 58ed2f9c

drivers/char/stallion.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -4753,13 +4753,14 @@ static int __init stallion_module_init(void)
		brdp->ioaddr2 = conf.ioaddr2;
		brdp->irq = conf.irq;
		brdp->irqtype = conf.irqtype;
		if (stl_brdinit(brdp))
		stl_brds[brdp->brdnr] = brdp;
		if (stl_brdinit(brdp)) {
		stl_brds[brdp->brdnr] = NULL;
		kfree(brdp);
		else {
		} else {
		for (j = 0; j < brdp->nrports; j++)
		tty_register_device(stl_serial,
		brdp->brdnr * STL_MAXPORTS + j, NULL);
		stl_brds[brdp->brdnr] = brdp;
		stl_nrbrds = i + 1;
		}
		}