From e07aa616467fa8842c7a65e75a5cf689dfac9070 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 5 Jul 2009 22:39:08 +0100
Subject: [PATCH] --- yaml --- r: 155030 b: refs/heads/master c:
 557dca5f48a45df88a73e69ee0700cfd4e2358c9 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/amba/bus.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f6f71489f070..a1655a36ec78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65b1bfc13e8f50034187e339aa12b81cd6785bd5
+refs/heads/master: 557dca5f48a45df88a73e69ee0700cfd4e2358c9
diff --git a/trunk/drivers/amba/bus.c b/trunk/drivers/amba/bus.c
index 3d763fdf99b7..246650673010 100644
--- a/trunk/drivers/amba/bus.c
+++ b/trunk/drivers/amba/bus.c
@@ -207,6 +207,16 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
 	void __iomem *tmp;
 	int i, ret;
 
+	device_initialize(&dev->dev);
+
+	/*
+	 * Copy from device_add
+	 */
+	if (dev->dev.init_name) {
+		dev_set_name(&dev->dev, "%s", dev->dev.init_name);
+		dev->dev.init_name = NULL;
+	}
+
 	dev->dev.release = amba_device_release;
 	dev->dev.bus = &amba_bustype;
 	dev->dev.dma_mask = &dev->dma_mask;
@@ -240,7 +250,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent)
 		goto err_release;
 	}
 
-	ret = device_register(&dev->dev);
+	ret = device_add(&dev->dev);
 	if (ret)
 		goto err_release;