From 698f6f7fd11d996e31039a5850240c9c9f06909a Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Dec 2006 02:39:24 -0800
Subject: [PATCH] --- yaml --- r: 43733 b: refs/heads/master c:
 140e92abe2bc9a0cd3ccfd11744ff4eb65319bb3 h: refs/heads/master i:   43731:
 8b865db009b632c794504d7755431fa20efc85f8 v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/char/istallion.c | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4ecde95bd011..25929a5fd22b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f8f5a5808ffc322c9c59e44fc3c0306d4f92ea4
+refs/heads/master: 140e92abe2bc9a0cd3ccfd11744ff4eb65319bb3
diff --git a/trunk/drivers/char/istallion.c b/trunk/drivers/char/istallion.c
index c8183ec09412..1050c426dcd0 100644
--- a/trunk/drivers/char/istallion.c
+++ b/trunk/drivers/char/istallion.c
@@ -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;