diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 19:59:44 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 19:59:44 +0000 |
| commit | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (patch) | |
| tree | 289dcbda5fbca34e7e0cf028908b9b517fa8b8b2 /drivers/of/platform.c | |
| parent | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (diff) | |
| parent | 75c06963dd947252271ffa6107a25cddb2b8f362 (diff) | |
| download | op-kernel-dev-dcf81c1af839b77b44404453ecae6e5ac5a75f05.zip op-kernel-dev-dcf81c1af839b77b44404453ecae6e5ac5a75f05.tar.gz | |
Merge branch 'amba' into for-armsoc
Diffstat (limited to 'drivers/of/platform.c')
| -rw-r--r-- | drivers/of/platform.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 63b3ec4..cae9477 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -253,7 +253,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, if (!of_device_is_available(node)) return NULL; - dev = kzalloc(sizeof(*dev), GFP_KERNEL); + dev = amba_device_alloc(NULL, 0, 0); if (!dev) return NULL; @@ -283,14 +283,14 @@ static struct amba_device *of_amba_device_create(struct device_node *node, if (ret) goto err_free; - ret = amba_device_register(dev, &iomem_resource); + ret = amba_device_add(dev, &iomem_resource); if (ret) goto err_free; return dev; err_free: - kfree(dev); + amba_device_put(dev); return NULL; } #else /* CONFIG_ARM_AMBA */ |
