OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Char: istallion, fix enabling 

Enable ISA cards before pci_register_driver and then, enable each PCI card in
probe function.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jiri Slaby 2006-12-08 02:39:24 -08:00 committed by Linus Torvalds
parent 8f8f5a5808
commit 140e92abe2
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/char/istallion.c
View File

@ -3968,6 +3968,10 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev,
brdp->state |= BST_PROBED;
pci_set_drvdata(pdev, brdp);
EBRDENABLE(brdp);
brdp->enable = NULL;
brdp->disable = NULL;
return 0;
err_null:
stli_brds[brdp->brdnr] = NULL;
@ -4054,13 +4058,6 @@ static int stli_initbrds(void)
if (retval > 0)
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
* no boards are sharing the "shared memory" regions then we can just
@ -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;
err:
return retval;