Commit 140e92ab authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

[PATCH] Char: istallion, fix enabling

Enable ISA cards before pci_register_driver and then, enable each PCI card in
probe function.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8f8f5a58
...@@ -3968,6 +3968,10 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev, ...@@ -3968,6 +3968,10 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev,
brdp->state |= BST_PROBED; brdp->state |= BST_PROBED;
pci_set_drvdata(pdev, brdp); pci_set_drvdata(pdev, brdp);
EBRDENABLE(brdp);
brdp->enable = NULL;
brdp->disable = NULL;
return 0; return 0;
err_null: err_null:
stli_brds[brdp->brdnr] = NULL; stli_brds[brdp->brdnr] = NULL;
...@@ -4054,13 +4058,6 @@ static int stli_initbrds(void) ...@@ -4054,13 +4058,6 @@ static int stli_initbrds(void)
if (retval > 0) if (retval > 0)
found += retval; found += retval;
retval = pci_register_driver(&stli_pcidriver);
if (retval && found == 0) {
printk(KERN_ERR "Neither isa nor eisa cards found nor pci "
"driver can be registered!\n");
goto err;
}
/* /*
* All found boards are initialized. Now for a little optimization, if * All found boards are initialized. Now for a little optimization, if
* no boards are sharing the "shared memory" regions then we can just * no boards are sharing the "shared memory" regions then we can just
...@@ -4099,6 +4096,13 @@ static int stli_initbrds(void) ...@@ -4099,6 +4096,13 @@ static int stli_initbrds(void)
} }
} }
retval = pci_register_driver(&stli_pcidriver);
if (retval && found == 0) {
printk(KERN_ERR "Neither isa nor eisa cards found nor pci "
"driver can be registered!\n");
goto err;
}
return 0; return 0;
err: err:
return retval; return retval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment