Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3585fdc7 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: davinci_vpfe: fix vpfe_ipipe_init() error handling 



As warned:
	drivers/staging/media/davinci_vpfe/dm365_ipipe.c:1834 vpfe_ipipe_init() error: we previously assumed 'res' could be null (see line 1797)

There's something wrong at vpfe_ipipe_init():

1) it caches the resourse_size() from from the first region
   and reuses to the second region;

2) the "res" var is overridden 3 times;

3) at free logic, it assumes that "res->start" is not
   overridden by platform_get_resource(pdev, IORESOURCE_MEM, 6),
   but that's not true, as it can even be NULL there.

This patch fixes the above issues by:

a) store the resources used by release_mem_region() on
   a separate var;

b) stop caching resource_size(), using the function where
   needed.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a8a04370

drivers/staging/media/davinci_vpfe/dm365_ipipe.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -1778,25 +1778,25 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev) 
	struct media_pad *pads = &ipipe->pads[0];

	struct media_pad *pads = &ipipe->pads[0];

	struct v4l2_subdev *sd = &ipipe->subdev;

	struct v4l2_subdev *sd = &ipipe->subdev;

	struct media_entity *me = &sd->entity;

	struct media_entity *me = &sd->entity;

	static resource_size_t  res_len;

	struct resource *res, *memres;

	struct resource *res;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 4);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 4);

	if (!res)

	if (!res)

		return -ENOENT;

		return -ENOENT;





	res_len = resource_size(res);

	memres = request_mem_region(res->start, resource_size(res), res->name);

	res = request_mem_region(res->start, res_len, res->name);

	if (!memres)

	if (!res)

		return -EBUSY;

		return -EBUSY;

	ipipe->base_addr = ioremap_nocache(res->start, res_len);

	ipipe->base_addr = ioremap_nocache(memres->start,

					   resource_size(memres));

	if (!ipipe->base_addr)

	if (!ipipe->base_addr)

		goto error_release;

		goto error_release;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 6);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 6);

	if (!res)

	if (!res)

		goto error_unmap;

		goto error_unmap;

	ipipe->isp5_base_addr = ioremap_nocache(res->start, res_len);

	ipipe->isp5_base_addr = ioremap_nocache(res->start,

						resource_size(res));

	if (!ipipe->isp5_base_addr)

	if (!ipipe->isp5_base_addr)

		goto error_unmap;

		goto error_unmap;
@@ -1831,7 +1831,7 @@ vpfe_ipipe_init(struct vpfe_ipipe_device *ipipe, struct platform_device *pdev) 
error_unmap:

error_unmap:

	iounmap(ipipe->base_addr);

	iounmap(ipipe->base_addr);

error_release:

error_release:

	release_mem_region(res->start, res_len);

	release_mem_region(memres->start, resource_size(memres));

	return -ENOMEM;

	return -ENOMEM;

}

}