From 694085ff81ae5b78337b477b5c32a4bdc83c9fcb Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 13 May 2011 18:46:10 +0200 Subject: [PATCH] --- yaml --- r: 253147 b: refs/heads/master c: 77f7059a329fc8a514bbcc2f204aaa7c150e8046 h: refs/heads/master i: 253145: 1ed673f48296cabffd984c27926e57bba49f4849 253143: f1fd88403d6ec0adfddb231589665cb915990672 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap1/dma.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7615d1094edb..81843f897c69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30ebad9d756a0b2c97c6c4ca6c5e6b799e3b64da +refs/heads/master: 77f7059a329fc8a514bbcc2f204aaa7c150e8046 diff --git a/trunk/arch/arm/mach-omap1/dma.c b/trunk/arch/arm/mach-omap1/dma.c index d8559344c6e2..f5a52204b89f 100644 --- a/trunk/arch/arm/mach-omap1/dma.c +++ b/trunk/arch/arm/mach-omap1/dma.c @@ -284,14 +284,15 @@ static int __init omap1_system_dma_init(void) dma_base = ioremap(res[0].start, resource_size(&res[0])); if (!dma_base) { pr_err("%s: Unable to ioremap\n", __func__); - return -ENODEV; + ret = -ENODEV; + goto exit_device_put; } ret = platform_device_add_resources(pdev, res, ARRAY_SIZE(res)); if (ret) { dev_err(&pdev->dev, "%s: Unable to add resources for %s%d\n", __func__, pdev->name, pdev->id); - goto exit_device_del; + goto exit_device_put; } p = kzalloc(sizeof(struct omap_system_dma_plat_info), GFP_KERNEL); @@ -299,7 +300,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_put; + goto exit_device_del; } d = kzalloc(sizeof(struct omap_dma_dev_attr), GFP_KERNEL); @@ -380,10 +381,10 @@ static int __init omap1_system_dma_init(void) kfree(d); exit_release_p: kfree(p); -exit_device_put: - platform_device_put(pdev); exit_device_del: platform_device_del(pdev); +exit_device_put: + platform_device_put(pdev); return ret; }