|
@@ -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;
|
|
|
|