Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[karo-tx-linux.git] / arch / arm / plat-mxc / devices.c

diff --git a/arch/arm/plat-mxc/devices.c b/arch/arm/plat-mxc/devices.c
index e9bcefe79a43d6edb1a18e8ade4b8b3f6bb83619..eee1b6096a0898ce869238cd5b421bca50a6e411 100644 (file)
--- a/arch/arm/plat-mxc/devices.c
+++ b/arch/arm/plat-mxc/devices.c
@@ -81,6 +81,8 @@ struct platform_device *__init imx_add_platform_device_dmamask(
        ret = platform_device_add(pdev);
        if (ret) {
 err:
+               if (dmamask)
+                       kfree(pdev->dev.dma_mask);
                platform_device_put(pdev);
                return ERR_PTR(ret);
        }