git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
devices.c
diff --git
a/arch/arm/plat-mxc/devices.c
b/arch/arm/plat-mxc/devices.c
index
e9bcefe
..
eee1b60
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);
}