summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-08-25 15:57:05 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-15 13:09:21 -0300
commit9f9831a8b61fb3cae76bc31561bafdb0a58ad12b (patch)
treeebf3b4aa942534a1390c16dc8f29b35bcecca8a8 /drivers
parent3920631c4b8af70893fe70df53e94adb0cd66f71 (diff)
downloadop-kernel-dev-9f9831a8b61fb3cae76bc31561bafdb0a58ad12b.zip
op-kernel-dev-9f9831a8b61fb3cae76bc31561bafdb0a58ad12b.tar.gz
[media] drivers/media/platform/mx2_emmaprp.c: adjust inconsistent IS_ERR and PTR_ERR
Change the call to IS_ERR to test the value that was just initialized and is returned using PTR_ERR. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression e,e1; @@ ( if (IS_ERR(e)) { ... PTR_ERR(e) ... } | if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... } | *if (IS_ERR(e)) { ... * PTR_ERR(e1) ... } ) // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Cc: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/mx2_emmaprp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 59aaca4..2236315 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -906,9 +906,8 @@ static int emmaprp_probe(struct platform_device *pdev)
}
pcdev->clk_emma_ahb = devm_clk_get(&pdev->dev, "ahb");
- if (IS_ERR(pcdev->clk_emma_ipg)) {
+ if (IS_ERR(pcdev->clk_emma_ahb))
return PTR_ERR(pcdev->clk_emma_ahb);
- }
irq_emma = platform_get_irq(pdev, 0);
res_emma = platform_get_resource(pdev, IORESOURCE_MEM, 0);
OpenPOWER on IntegriCloud