tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Ingo Korb and committed by
Linus Torvalds b08b5ad9 58ed2f9c

+4 -3
+4 -3
drivers/char/stallion.c
··· 4753 4753 brdp->ioaddr2 = conf.ioaddr2; 4754 4754 brdp->irq = conf.irq; 4755 4755 brdp->irqtype = conf.irqtype; 4756 - if (stl_brdinit(brdp)) 4756 + stl_brds[brdp->brdnr] = brdp; 4757 + if (stl_brdinit(brdp)) { 4758 + stl_brds[brdp->brdnr] = NULL; 4757 4759 kfree(brdp); 4758 - else { 4760 + } else { 4759 4761 for (j = 0; j < brdp->nrports; j++) 4760 4762 tty_register_device(stl_serial, 4761 4763 brdp->brdnr * STL_MAXPORTS + j, NULL); 4762 - stl_brds[brdp->brdnr] = brdp; 4763 4764 stl_nrbrds = i + 1; 4764 4765 } 4765 4766 }