* Wei Yongjun <weiyj.lk@xxxxxxxxx> [130426 01:36]:
> From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
>
> 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@xxxxxxxxxxxxxxxxx>
> ---
> 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);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
