From 94077c40a8a2e04015e3d187953b69d313cbdf35 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 18 Dec 2011 11:45:17 +0000 Subject: [PATCH] --- yaml --- r: 295341 b: refs/heads/master c: c0f72f8a9279f82520fc476c32c09f693661c5f4 h: refs/heads/master i: 295339: 60a256e2e5675c72fbfdfeaf64c9cd5e1bf20388 v: v3 --- [refs] | 2 +- trunk/drivers/of/platform.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8113dbcd025e..bf38d67332fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5dc9271b25822f36d299f8cab985379743424b9 +refs/heads/master: c0f72f8a9279f82520fc476c32c09f693661c5f4 diff --git a/trunk/drivers/of/platform.c b/trunk/drivers/of/platform.c index 63b3ec48c203..cae9477a6ed3 100644 --- a/trunk/drivers/of/platform.c +++ b/trunk/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 */