leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: media: Unmap and release region obtained by ioremap_nocache

Browse Source 
Free memory mapping, if vpfe_ipipe_init is not successful.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Arvind Yadav 2017-03-17 12:21:23 +05:30 committed by Greg Kroah-Hartman
parent 7369e062fd
commit 4b4eda0017
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/media/davinci_vpfe/dm365_ipipe.c
View File

@ -1803,14 +1803,14 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev)
return -EBUSY; return -EBUSY;
ipipe->base_addr = ioremap_nocache(res->start, res_len); ipipe->base_addr = ioremap_nocache(res->start, res_len);
if (!ipipe->base_addr) if (!ipipe->base_addr)
return -EBUSY; goto error_release;
res = platform_get_resource(pdev, IORESOURCE_MEM, 6); res = platform_get_resource(pdev, IORESOURCE_MEM, 6);
if (!res) if (!res)
return -ENOENT; goto error_unmap;
ipipe->isp5_base_addr = ioremap_nocache(res->start, res_len); ipipe->isp5_base_addr = ioremap_nocache(res->start, res_len);
if (!ipipe->isp5_base_addr) if (!ipipe->isp5_base_addr)
return -EBUSY; goto error_unmap;
v4l2_subdev_init(sd, &ipipe_v4l2_ops); v4l2_subdev_init(sd, &ipipe_v4l2_ops);
sd->internal_ops = &ipipe_v4l2_internal_ops; sd->internal_ops = &ipipe_v4l2_internal_ops;
@ -1839,6 +1839,12 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev)
sd->ctrl_handler = &ipipe->ctrls; sd->ctrl_handler = &ipipe->ctrls;
return media_entity_pads_init(me, IPIPE_PADS_NUM, pads); 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;
} }
/* /*