Skip to contentSkip to conversation

Char: istallion, free only isa

PATCH In review Jiri Slaby 1 participant 1 message Nov 4, 2006 Char and misc drivers

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 7/8 Char: istallion, free only isa

istallion, free only isa

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.

---
commit 0e8470b600af83b7421c85d85c1b7c9b63ad21aa
tree 8bc93e102991bfc544bcbd268a48721b974053b8
parent 177cc17270356497ba04bb03b5688e429c3cfbdb
author Jiri Slaby <[email protected]> Sat, 04 Nov 2006 20:48:29 +0059 committer Jiri Slaby <[email protected]> Sat, 04 Nov 2006 20:48:29 +0059

 drivers/char/istallion.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
drivers/char/istallion.c +3 -1
index 6569398..0502e5d 100644
@@ -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
@@ -791,7 +792,7 @@ static void __exit istallion_module_exit
 	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);
@@ -3956,6 +3957,7 @@ static int __devinit stli_pciprobe(struc
 	if (retval)
 		goto err_null;
 
+	brdp->state |= BST_PROBED;
 	pci_set_drvdata(pdev, brdp);
 
 	return 0;