diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-08 18:10:42 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-04 00:31:46 +0100 |
| commit | 9834f81314b2a5b1bb3cd0d8f46e61528b60d580 (patch) | |
| tree | 6fb62c450a3a6587b312d2f0542b4fe25af7767d /arch/arm/mach-omap2/dma.c | |
| parent | 0ef64986d69602ba8df933c62d0b6d6edfaf0557 (diff) | |
| download | op-kernel-dev-9834f81314b2a5b1bb3cd0d8f46e61528b60d580.zip op-kernel-dev-9834f81314b2a5b1bb3cd0d8f46e61528b60d580.tar.gz | |
ARM: omap: move dma channel allocation into plat-omap code
This really needs to be there, because otherwise the plat-omap code can
kfree() this data structure, and then re-use the pointer later.
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2/dma.c')
| -rw-r--r-- | arch/arm/mach-omap2/dma.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/dma.c b/arch/arm/mach-omap2/dma.c index 244ff50..9f210d6 100644 --- a/arch/arm/mach-omap2/dma.c +++ b/arch/arm/mach-omap2/dma.c @@ -251,13 +251,6 @@ static int __init omap2_system_dma_init_dev(struct omap_hwmod *oh, void *unused) } d = oh->dev_attr; - d->chan = kzalloc(sizeof(struct omap_dma_lch) * - (d->lch_count), GFP_KERNEL); - - if (!d->chan) { - dev_err(&pdev->dev, "%s: kzalloc fail\n", __func__); - return -ENOMEM; - } if (cpu_is_omap34xx() && (omap_type() != OMAP2_DEVICE_TYPE_GP)) d->dev_caps |= HS_CHANNELS_RESERVED; |
