[PATCH] Staging: media: Unmap and release region obtained by ioremap_nocache

[Arvind Yadav]

Free memory mapping, if vpfe_ipipe_init is not successful.

Signed-off-by: Arvind Yadav <arvind.yadav...@gmail.com>
---
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c 
b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
index ff47a8f3..6a3434c 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
@@ -1803,14 +1803,14 @@ void vpfe_ipipe_unregister_entities(struct 
vpfe_ipipe_device *vpfe_ipipe)
                return -EBUSY;
        ipipe->base_addr = ioremap_nocache(res->start, res_len);
        if (!ipipe->base_addr)
-               return -EBUSY;
+               goto error_release;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 6);
        if (!res)
-               return -ENOENT;
+               goto error_unmap;
        ipipe->isp5_base_addr = ioremap_nocache(res->start, res_len);
        if (!ipipe->isp5_base_addr)
-               return -EBUSY;
+               goto error_unmap;
 
        v4l2_subdev_init(sd, &ipipe_v4l2_ops);
        sd->internal_ops = &ipipe_v4l2_internal_ops;
@@ -1839,6 +1839,12 @@ void vpfe_ipipe_unregister_entities(struct 
vpfe_ipipe_device *vpfe_ipipe)
        sd->ctrl_handler = &ipipe->ctrls;
 
        return media_entity_pads_init(me, IPIPE_PADS_NUM, pads);
+
+error_unmap:
+       iounmap(ipipe->base_addr);
+error_release:
+       release_mem_region(res->start, res_len);
+       return -ENOMEM;
 }
 
 /*
-- 
1.9.1