The patch titled
Char: stallion, fix oops during init with ISA cards
has been removed from the -mm tree. Its filename was
char-stallion-fix-oops-during-init-with-isa-cards.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Char: stallion, fix oops during init with ISA cards
From: Ingo Korb <ml@xxxxxxxx>
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@xxxxxxxx>
Acked-by: Jiri Slaby <jirislaby@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/stallion.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/char/stallion.c~char-stallion-fix-oops-during-init-with-isa-cards drivers/char/stallion.c
--- a/drivers/char/stallion.c~char-stallion-fix-oops-during-init-with-isa-cards
+++ a/drivers/char/stallion.c
@@ -4753,13 +4753,14 @@ static int __init stallion_module_init(v
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;
}
}
_
Patches currently in -mm which might be from ml@xxxxxxxx are
char-istallion-initlocking-fixes-try-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
