projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/r600/kms: fixup number of loops per blit calculation.
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
amba
/
bus.c
diff --git
a/drivers/amba/bus.c
b/drivers/amba/bus.c
index 3d763fdf99b7d2409f8dbf425822ace5f1063cea..246650673010594d08c139551da1973318f78685 100644
(file)
--- a/
drivers/amba/bus.c
+++ b/
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;
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;
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;
}
goto err_release;
}
- ret = device_
register
(&dev->dev);
+ ret = device_
add
(&dev->dev);
if (ret)
goto err_release;
if (ret)
goto err_release;