ARM: mxs: free dma_mask in error path
[linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git] / arch / arm / mach-mxs / devices.c
blobcfdb6b284702d75fb38cbf79fd97b4331ee46600
1 /*
2 * Copyright 2008 Sascha Hauer, kernel@pengutronix.de
4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License
6 * as published by the Free Software Foundation; either version 2
7 * of the License, or (at your option) any later version.
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
13 * You should have received a copy of the GNU General Public License
14 * along with this program; if not, write to the Free Software
15 * Foundation, Inc., 51 Franklin Street, Fifth Floor,
16 * Boston, MA 02110-1301, USA.
19 #include <linux/kernel.h>
20 #include <linux/slab.h>
21 #include <linux/init.h>
22 #include <linux/platform_device.h>
23 #include <linux/amba/bus.h>
25 struct platform_device *__init mxs_add_platform_device_dmamask(
26 const char *name, int id,
27 const struct resource *res, unsigned int num_resources,
28 const void *data, size_t size_data, u64 dmamask)
30 int ret = -ENOMEM;
31 struct platform_device *pdev;
33 pdev = platform_device_alloc(name, id);
34 if (!pdev)
35 goto err;
37 if (dmamask) {
39 * This memory isn't freed when the device is put,
40 * I don't have a nice idea for that though. Conceptually
41 * dma_mask in struct device should not be a pointer.
42 * See http://thread.gmane.org/gmane.linux.kernel.pci/9081
44 pdev->dev.dma_mask =
45 kmalloc(sizeof(*pdev->dev.dma_mask), GFP_KERNEL);
46 if (!pdev->dev.dma_mask)
47 /* ret is still -ENOMEM; */
48 goto err;
50 *pdev->dev.dma_mask = dmamask;
51 pdev->dev.coherent_dma_mask = dmamask;
54 if (res) {
55 ret = platform_device_add_resources(pdev, res, num_resources);
56 if (ret)
57 goto err;
60 if (data) {
61 ret = platform_device_add_data(pdev, data, size_data);
62 if (ret)
63 goto err;
66 ret = platform_device_add(pdev);
67 if (ret) {
68 err:
69 if (dmamask)
70 kfree(pdev->dev.dma_mask);
71 platform_device_put(pdev);
72 return ERR_PTR(ret);
75 return pdev;
78 int __init mxs_add_amba_device(const struct amba_device *dev)
80 struct amba_device *adev = kmalloc(sizeof(*adev), GFP_KERNEL);
82 if (!adev) {
83 pr_err("%s: failed to allocate memory", __func__);
84 return -ENOMEM;
87 *adev = *dev;
89 return amba_device_register(adev, &iomem_resource);