| Message ID | 20140113185503.GE27282@n2100.arm.linux.org.uk |
|---|---|
| State | New |
| Headers | show |
* Russell King - ARM Linux <linux@arm.linux.org.uk> [140113 10:57]: > On Mon, Jan 13, 2014 at 09:37:45AM -0800, Tony Lindgren wrote: > > * Russell King - ARM Linux <linux@arm.linux.org.uk> [140113 08:48]: > > > Any news on this? > > > > Sorry for the delay, now getting this: > > > > arch/arm/mach-omap1/dma.c: In function ‘omap1_system_dma_init’: > > arch/arm/mach-omap1/dma.c:368: error: ‘struct omap_dma_dev_attr’ has no member named ‘chan’ > > Gah. Next incremental patch: Thanks, now getting this on omap1: # dmesg | grep -i dma DMA: preallocated 256 KiB pool for atomic coherent allocations OMAP DMA hardware version 1 DMA capabilities: 0000000c:00000000:01ff:003f:007f omap-dma-engine omap-dma-engine: invalid resource omap-dma-engine: probe of omap-dma-engine failed with error -22 mmci-omap mmci-omap.1: unable to obtain TX DMA engine channel 54 mmci-omap mmci-omap.1: unable to obtain RX DMA engine channel 55 Regards, Tony
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c index 404f89e3eeb8..1b1b64647def 100644 --- a/arch/arm/mach-omap1/dma.c +++ b/arch/arm/mach-omap1/dma.c @@ -344,14 +344,14 @@ static int __init omap1_system_dma_init(void) if (ret) { dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n", __func__, pdev->name, pdev->id); - goto exit_release_chan; + goto exit_release_d; } ret = platform_device_add(pdev); if (ret) { dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n", __func__, pdev->name, pdev->id); - goto exit_release_chan; + goto exit_release_d; } dma_pdev = platform_device_register_full(&omap_dma_dev_info); @@ -364,8 +364,6 @@ static int __init omap1_system_dma_init(void) exit_release_pdev: platform_device_del(pdev); -exit_release_chan: - kfree(d->chan); exit_release_d: kfree(d); exit_iounmap: