---

yaml --- r: 43731 b: refs/heads/master c: 3901417 h: refs/heads/master i: 43729: 7612e78 43727: 950905d v: v3
git-mirror · Dec 8, 2006 · 8b865db · 8b865db
1 parent 236773f
commit 8b865db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b103b5cfcb8e6703b40124da631adfdd1470d878
+refs/heads/master: 390141728f2165889a8154bfb3ddddf6d95d9b8d
diff --git a/trunk/drivers/char/istallion.c b/trunk/drivers/char/istallion.c
@@ -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(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);
@@ -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;