From 3ea68b1d013d1544b790b0c6a84a646b90792976 Mon Sep 17 00:00:00 2001
From: Eric Moore <eric.moore@lsil.com>
Date: Tue, 11 Jul 2006 17:23:23 -0600
Subject: [PATCH] --- yaml --- r: 32750 b: refs/heads/master c:
 d58b2725d28041ff9412fecb109bebf76b1a9b26 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/message/fusion/mptbase.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 2f6dba996aaa..0e8dd323a28d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 786899b013cdf7aeb2aaaf7390c442f02bba24af
+refs/heads/master: d58b2725d28041ff9412fecb109bebf76b1a9b26
diff --git a/trunk/drivers/message/fusion/mptbase.c b/trunk/drivers/message/fusion/mptbase.c
index 43308df64623..10def27c1af5 100644
--- a/trunk/drivers/message/fusion/mptbase.c
+++ b/trunk/drivers/message/fusion/mptbase.c
@@ -678,19 +678,19 @@ int
 mpt_device_driver_register(struct mpt_pci_driver * dd_cbfunc, int cb_idx)
 {
 	MPT_ADAPTER	*ioc;
+	const struct pci_device_id *id;
 
-	if (cb_idx < 1 || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS) {
+	if (cb_idx < 1 || cb_idx >= MPT_MAX_PROTOCOL_DRIVERS)
 		return -EINVAL;
-	}
 
 	MptDeviceDriverHandlers[cb_idx] = dd_cbfunc;
 
 	/* call per pci device probe entry point */
 	list_for_each_entry(ioc, &ioc_list, list) {
-		if(dd_cbfunc->probe) {
-			dd_cbfunc->probe(ioc->pcidev,
-			  ioc->pcidev->driver->id_table);
-  		}
+		id = ioc->pcidev->driver ?
+		    ioc->pcidev->driver->id_table : NULL;
+		if (dd_cbfunc->probe)
+			dd_cbfunc->probe(ioc->pcidev, id);
 	 }
 
 	return 0;