Commit d1bb4b29 authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab

[media] drivers/media/platform/mx2_emmaprp.c: use devm_kzalloc and devm_clk_get

Using devm_kzalloc simplifies the code and ensures that the use of
devm_request_irq is safe.  When kzalloc and kfree were used, the interrupt
could be triggered after the handler's data argument had been freed.

This also introduces some missing initializations of the return variable
ret, and uses devm_request_and_ioremap instead of the combination of
devm_request_mem_region and devm_ioremap.

The problem of a free after a devm_request_irq was found using the
following semantic match (http://coccinelle.lip6.fr/)

// <smpl>
@r exists@
expression e1,e2,x,a,b,c,d;
identifier free;
position p1,p2;
@@

  devm_request_irq@p1(e1,e2,...,x)
  ... when any
      when != e2 = a
      when != x = b
  if (...) {
    ... when != e2 = c
        when != x = d
    free@p2(...,x,...);
    ...
    return ...;
  }
// </smpl>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 071408b6
...@@ -896,7 +896,7 @@ static int emmaprp_probe(struct platform_device *pdev) ...@@ -896,7 +896,7 @@ static int emmaprp_probe(struct platform_device *pdev)
int irq_emma; int irq_emma;
int ret; int ret;
pcdev = kzalloc(sizeof *pcdev, GFP_KERNEL); pcdev = devm_kzalloc(&pdev->dev, sizeof(*pcdev), GFP_KERNEL);
if (!pcdev) if (!pcdev)
return -ENOMEM; return -ENOMEM;
...@@ -904,27 +904,24 @@ static int emmaprp_probe(struct platform_device *pdev) ...@@ -904,27 +904,24 @@ static int emmaprp_probe(struct platform_device *pdev)
pcdev->clk_emma_ipg = devm_clk_get(&pdev->dev, "ipg"); pcdev->clk_emma_ipg = devm_clk_get(&pdev->dev, "ipg");
if (IS_ERR(pcdev->clk_emma_ipg)) { if (IS_ERR(pcdev->clk_emma_ipg)) {
ret = PTR_ERR(pcdev->clk_emma_ipg); return PTR_ERR(pcdev->clk_emma_ipg);
goto free_dev;
} }
pcdev->clk_emma_ahb = devm_clk_get(&pdev->dev, "ahb"); pcdev->clk_emma_ahb = devm_clk_get(&pdev->dev, "ahb");
if (IS_ERR(pcdev->clk_emma_ipg)) { if (IS_ERR(pcdev->clk_emma_ipg)) {
ret = PTR_ERR(pcdev->clk_emma_ahb); return PTR_ERR(pcdev->clk_emma_ahb);
goto free_dev;
} }
irq_emma = platform_get_irq(pdev, 0); irq_emma = platform_get_irq(pdev, 0);
res_emma = platform_get_resource(pdev, IORESOURCE_MEM, 0); res_emma = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (irq_emma < 0 || res_emma == NULL) { if (irq_emma < 0 || res_emma == NULL) {
dev_err(&pdev->dev, "Missing platform resources data\n"); dev_err(&pdev->dev, "Missing platform resources data\n");
ret = -ENODEV; return -ENODEV;
goto free_dev;
} }
ret = v4l2_device_register(&pdev->dev, &pcdev->v4l2_dev); ret = v4l2_device_register(&pdev->dev, &pcdev->v4l2_dev);
if (ret) if (ret)
goto free_dev; return ret;
mutex_init(&pcdev->dev_mutex); mutex_init(&pcdev->dev_mutex);
...@@ -946,21 +943,20 @@ static int emmaprp_probe(struct platform_device *pdev) ...@@ -946,21 +943,20 @@ static int emmaprp_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, pcdev); platform_set_drvdata(pdev, pcdev);
if (devm_request_mem_region(&pdev->dev, res_emma->start, pcdev->base_emma = devm_request_and_ioremap(&pdev->dev, res_emma);
resource_size(res_emma), MEM2MEM_NAME) == NULL) if (!pcdev->base_emma) {
goto rel_vdev; ret = -ENXIO;
pcdev->base_emma = devm_ioremap(&pdev->dev, res_emma->start,
resource_size(res_emma));
if (!pcdev->base_emma)
goto rel_vdev; goto rel_vdev;
}
pcdev->irq_emma = irq_emma; pcdev->irq_emma = irq_emma;
pcdev->res_emma = res_emma; pcdev->res_emma = res_emma;
if (devm_request_irq(&pdev->dev, pcdev->irq_emma, emmaprp_irq, if (devm_request_irq(&pdev->dev, pcdev->irq_emma, emmaprp_irq,
0, MEM2MEM_NAME, pcdev) < 0) 0, MEM2MEM_NAME, pcdev) < 0) {
ret = -ENODEV;
goto rel_vdev; goto rel_vdev;
}
pcdev->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev); pcdev->alloc_ctx = vb2_dma_contig_init_ctx(&pdev->dev);
if (IS_ERR(pcdev->alloc_ctx)) { if (IS_ERR(pcdev->alloc_ctx)) {
...@@ -993,8 +989,6 @@ static int emmaprp_probe(struct platform_device *pdev) ...@@ -993,8 +989,6 @@ static int emmaprp_probe(struct platform_device *pdev)
video_device_release(vfd); video_device_release(vfd);
unreg_dev: unreg_dev:
v4l2_device_unregister(&pcdev->v4l2_dev); v4l2_device_unregister(&pcdev->v4l2_dev);
free_dev:
kfree(pcdev);
return ret; return ret;
} }
...@@ -1009,7 +1003,6 @@ static int emmaprp_remove(struct platform_device *pdev) ...@@ -1009,7 +1003,6 @@ static int emmaprp_remove(struct platform_device *pdev)
v4l2_m2m_release(pcdev->m2m_dev); v4l2_m2m_release(pcdev->m2m_dev);
vb2_dma_contig_cleanup_ctx(pcdev->alloc_ctx); vb2_dma_contig_cleanup_ctx(pcdev->alloc_ctx);
v4l2_device_unregister(&pcdev->v4l2_dev); v4l2_device_unregister(&pcdev->v4l2_dev);
kfree(pcdev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment