From db3a44b66d17b948f0e95e2090d73b6ee440a33b Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Fri, 22 Apr 2005 15:56:57 +0000
Subject: [PATCH] Debug message fixes.

---
 src/drivers/bus/eisa.c   | 3 +++
 src/drivers/bus/isapnp.c | 5 +++--
 src/drivers/bus/mca.c    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/drivers/bus/eisa.c b/src/drivers/bus/eisa.c
index c50d4b2b..e8fb5697 100644
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -171,4 +171,7 @@ void eisa_device_enabled ( struct eisa_device *eisa, int enabled ) {
 	outb ( enabled ? EISA_CMD_ENABLE : 0,
 	       eisa->ioaddr + EISA_GLOBAL_CONFIG );
 	udelay ( 1000 ); /* Must wait 800 */
+
+	DBG ( "EISA %s device %hhx\n", ( enabled ? "enabled" : "disabled" ),
+	      eisa->slot );
 }
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c
index 61ee6843..335b90b6 100644
--- a/src/drivers/bus/isapnp.c
+++ b/src/drivers/bus/isapnp.c
@@ -555,7 +555,7 @@ static int isapnp_check_driver ( struct bus_dev *bus_dev,
 			      isapnp->prod_id,
 			      isa_id_string( isapnp->vendor_id,
 					     isapnp->prod_id ),
-			      id->name, driver->name );
+			      id->name, device_driver->name );
 			isapnp->name = id->name;
 			return 1;
 		}
@@ -622,7 +622,8 @@ void isapnp_device_activation ( struct isapnp_device *isapnp,
 	/* Return all cards to Wait for Key state */
 	isapnp_wait_for_key ();
 
-	DBG ( "ISAPnP activated device %hhx.%hhx\n",
+	DBG ( "ISAPnP %s device %hhx.%hhx\n",
+	      ( activation ? "activated" : "deactivated" ),
 	      isapnp->csn, isapnp->logdev );
 }
 
diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index 5a9d339d..1561faee 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -96,7 +96,7 @@ static int mca_check_driver ( struct bus_dev *bus_dev,
 		if ( MCA_ID ( mca ) == id->id ) {
 			DBG ( "MCA found ID %hx (device %s) "
 			      "matching driver %s\n",
-			      id->name, id->id, driver->name );
+			      id->name, id->id, device_driver->name );
 			mca->name = id->name;
 			return 1;
 		}