5 files changed, 8 insertions, 6 deletions
diff --git a/src/drivers/bus/eisa.c b/src/drivers/bus/eisa.c
index 22a615860..a4efe2621 100644
--- a/src/drivers/bus/eisa.c
+++ b/src/drivers/bus/eisa.c
@@ -63,8 +63,8 @@ static int eisa_probe ( struct eisa_device *eisa ) {
 			     ISA_PROD_ID ( eisa->prod_id ) )
 				continue;
 			eisa->driver = driver;
-			eisa->driver_name = id->name;
-			DBG ( "...using driver %s\n", eisa->driver_name );
+			eisa->dev.driver_name = id->name;
+			DBG ( "...using driver %s\n", eisa->dev.driver_name );
 			if ( ( rc = driver->probe ( eisa, id ) ) != 0 ) {
 				DBG ( "......probe failed\n" );
 				continue;
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c
index e40d382a6..9b562c664 100644
--- a/src/drivers/bus/isa.c
+++ b/src/drivers/bus/isa.c
@@ -114,6 +114,7 @@ static int isabus_probe ( struct root_device *rootdev ) {
 			/* Add to device hierarchy */
 			snprintf ( isa->dev.name, sizeof ( isa->dev.name ),
 				   "ISA%04x", isa->ioaddr );
+			isa->dev.driver_name = driver->name;
 			isa->dev.desc.bus_type = BUS_TYPE_ISA;
 			isa->dev.desc.vendor = driver->vendor_id;
 			isa->dev.desc.device = driver->prod_id;
diff --git a/src/drivers/bus/isapnp.c b/src/drivers/bus/isapnp.c
index d8bfcd7c2..f7845d3fa 100644
--- a/src/drivers/bus/isapnp.c
+++ b/src/drivers/bus/isapnp.c
@@ -600,8 +600,8 @@ static int isapnp_probe ( struct isapnp_device *isapnp ) {
 			     ISA_PROD_ID ( isapnp->prod_id ) )
 				continue;
 			isapnp->driver = driver;
-			isapnp->driver_name = id->name;
-			DBG ( "...using driver %s\n", isapnp->driver_name );
+			isapnp->dev.driver_name = id->name;
+			DBG ( "...using driver %s\n", isapnp->dev.driver_name );
 			if ( ( rc = driver->probe ( isapnp, id ) ) != 0 ) {
 				DBG ( "......probe failed\n" );
 				continue;
diff --git a/src/drivers/bus/mca.c b/src/drivers/bus/mca.c
index 055b010df..0405c3b88 100644
--- a/src/drivers/bus/mca.c
+++ b/src/drivers/bus/mca.c
@@ -44,8 +44,8 @@ static int mca_probe ( struct mca_device *mca ) {
 			if ( id->id != MCA_ID ( mca ) )
 				continue;
 			mca->driver = driver;
-			mca->driver_name = id->name;
-			DBG ( "...using driver %s\n", mca->driver_name );
+			mca->dev.driver_name = id->name;
+			DBG ( "...using driver %s\n", mca->dev.driver_name );
 			if ( ( rc = driver->probe ( mca, id ) ) != 0 ) {
 				DBG ( "......probe failed\n" );
 				continue;
diff --git a/src/drivers/linux/linux.c b/src/drivers/linux/linux.c
index 1f26f5663..83546b27e 100644
--- a/src/drivers/linux/linux.c
+++ b/src/drivers/linux/linux.c
@@ -75,6 +75,7 @@ static int linux_probe(struct root_device *rootdev)
 
 		if (driver->probe(device, request) == 0) {
 			device->driver = driver;
+			device->dev.driver_name = driver->name;
 			/* Driver handled the device so release ownership */
 			device = NULL;
 		} else {