* [PATCH] ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
@ 2013-04-26 8:31 ` Wei Yongjun
0 siblings, 0 replies; 4+ messages in thread
From: Wei Yongjun @ 2013-04-26 8:31 UTC (permalink / raw)
To: tony, linux; +Cc: yongjun_wei, linux-arm-kernel, linux-omap
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Add the missing iounmap() before return from omap1_system_dma_init()
in the error handling case.
Also removed platform_device_del() on add resources error case which
cause dup device delete.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
no compile test.
---
arch/arm/mach-omap1/dma.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 1a4e887..68ab858 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/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 @@ exit_release_d:
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);
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
@ 2013-04-26 8:31 ` Wei Yongjun
0 siblings, 0 replies; 4+ messages in thread
From: Wei Yongjun @ 2013-04-26 8:31 UTC (permalink / raw)
To: linux-arm-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Add the missing iounmap() before return from omap1_system_dma_init()
in the error handling case.
Also removed platform_device_del() on add resources error case which
cause dup device delete.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
no compile test.
---
arch/arm/mach-omap1/dma.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
index 1a4e887..68ab858 100644
--- a/arch/arm/mach-omap1/dma.c
+++ b/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 @@ exit_release_d:
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);
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
2013-04-26 8:31 ` Wei Yongjun
@ 2013-05-08 23:10 ` Tony Lindgren
-1 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2013-05-08 23:10 UTC (permalink / raw)
To: Wei Yongjun; +Cc: linux, yongjun_wei, linux-arm-kernel, linux-omap
* Wei Yongjun <weiyj.lk@gmail.com> [130426 01:36]:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Add the missing iounmap() before return from omap1_system_dma_init()
> in the error handling case.
> Also removed platform_device_del() on add resources error case which
> cause dup device delete.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> no compile test.
Seems to work, applying into omap-for-v3.10/fixes thanks.
Tony
> arch/arm/mach-omap1/dma.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
> index 1a4e887..68ab858 100644
> --- a/arch/arm/mach-omap1/dma.c
> +++ b/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 @@ exit_release_d:
> 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);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH] ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init()
@ 2013-05-08 23:10 ` Tony Lindgren
0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2013-05-08 23:10 UTC (permalink / raw)
To: linux-arm-kernel
* Wei Yongjun <weiyj.lk@gmail.com> [130426 01:36]:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Add the missing iounmap() before return from omap1_system_dma_init()
> in the error handling case.
> Also removed platform_device_del() on add resources error case which
> cause dup device delete.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
> no compile test.
Seems to work, applying into omap-for-v3.10/fixes thanks.
Tony
> arch/arm/mach-omap1/dma.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-omap1/dma.c b/arch/arm/mach-omap1/dma.c
> index 1a4e887..68ab858 100644
> --- a/arch/arm/mach-omap1/dma.c
> +++ b/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 @@ exit_release_d:
> 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);
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-05-08 23:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-26 8:31 [PATCH] ARM: OMAP1: DMA: fix error handling in omap1_system_dma_init() Wei Yongjun
2013-04-26 8:31 ` Wei Yongjun
2013-05-08 23:10 ` Tony Lindgren
2013-05-08 23:10 ` Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.