From b3fe1f6afa408d55bfd724bc1a01a415f91bc2a1 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Wed, 8 May 2013 16:48:02 -0700 Subject: [PATCH] --- yaml --- r: 375009 b: refs/heads/master c: 348c34225d4395b769ec6d283b0c7ace0b430a38 h: refs/heads/master i: 375007: 45385aabbe16a865244a44a38ba0105fc96e7e02 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/dma.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f3c4eab27615..90233a048e6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7e17c538604928b98107a08c2c5dc54745d85fe +refs/heads/master: 348c34225d4395b769ec6d283b0c7ace0b430a38 diff --git a/trunk/arch/arm/mach-omap1/dma.c b/trunk/arch/arm/mach-omap1/dma.c index 1a4e887f028d..68ab858e27b7 100644 --- a/trunk/arch/arm/mach-omap1/dma.c +++ b/trunk/arch/arm/mach-omap1/dma.c @@ -301,7 +301,7 @@ 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_device_put; + goto exit_iounmap; } p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL); @@ -309,7 +309,7 @@ static int __init omap1_system_dma_init(void) dev_err(&pdev->dev, "%s: Unable to allocate 'p' for %s\n", __func__, pdev->name); ret = -ENOMEM; - goto exit_device_del; + goto exit_iounmap; } d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL); @@ -402,8 +402,8 @@ static int __init omap1_system_dma_init(void) kfree(d); exit_release_p: kfree(p); -exit_device_del: - platform_device_del(pdev); +exit_iounmap: + iounmap(dma_base); exit_device_put: platform_device_put(pdev);