diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index e2204da..5251be6 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -30,10 +30,11 @@
 	if (get_bus_by_name(bus->name))
 		return -EEXIST;
 
-	strcpy(bus->dev.name, bus->name);
-	bus->dev.id = DEVICE_ID_SINGLE;
+	bus->dev = xzalloc(sizeof(*bus->dev));
+	strcpy(bus->dev->name, bus->name);
+	bus->dev->id = DEVICE_ID_SINGLE;
 
-	ret = register_device(&bus->dev);
+	ret = register_device(bus->dev);
 	if (ret)
 		return ret;
 
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index fa30c68..487f478 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -135,7 +135,7 @@
 
 	if (new_device->bus) {
 		if (!new_device->parent)
-			new_device->parent = &new_device->bus->dev;
+			new_device->parent = new_device->bus->dev;
 
 		list_add_tail(&new_device->bus_list, &new_device->bus->device_list);
 
diff --git a/include/driver.h b/include/driver.h
index 46c56c0..2d107e1 100644
--- a/include/driver.h
+++ b/include/driver.h
@@ -368,7 +368,7 @@
 	int (*probe)(struct device_d *dev);
 	void (*remove)(struct device_d *dev);
 
-	struct device_d dev;
+	struct device_d *dev;
 
 	struct list_head list;
 	struct list_head device_list;