iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel

Browse Source
This commit is contained in:
Russell King
2009-09-12 12:01:34 +01:00
committed by Russell King
parent b736b89f8a 8c3cbd5a2b 57a473f2f9 af1057abd7 c1cb6b7fb5 65cec8e3db 8e22676e56
commit cf7a2b4fb6
1298 changed files with 53933 additions and 14615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/amba/bus.c
View File

@ -208,6 +208,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;
@ -250,7 +260,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;