Skip to content

Commit

Permalink
[PATCH] Char: istallion, free only isa
Browse files Browse the repository at this point in the history
Only ISA cards should be freed in module exit.  Pci probed are freed in
pci_remove.  Define a flag, where we store this info a what to check against.

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>
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Dec 8, 2006
1 parent b103b5c commit 3901417
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/char/istallion.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ static int stli_shared;
*/
#define BST_FOUND 0x1
#define BST_STARTED 0x2
#define BST_PROBED 0x4

/*
* Define the set of port state flags. These are marked for internal
Expand Down Expand Up @@ -791,7 +792,7 @@ static void __exit istallion_module_exit(void)
kfree(stli_txcookbuf);

for (j = 0; (j < stli_nrbrds); j++) {
if ((brdp = stli_brds[j]) == NULL)
if ((brdp = stli_brds[j]) == NULL || (brdp->state & BST_PROBED))
continue;

stli_cleanup_ports(brdp);
Expand Down Expand Up @@ -3956,6 +3957,7 @@ static int __devinit stli_pciprobe(struct pci_dev *pdev,
if (retval)
goto err_null;

brdp->state |= BST_PROBED;
pci_set_drvdata(pdev, brdp);

return 0;
Expand Down

0 comments on commit 3901417

Please sign in to comment.