Commit 15514fb5 authored by Tony Prisk's avatar Tony Prisk Committed by Mauro Carvalho Chehab

[media] s5p-g2d: Fix incorrect usage of IS_ERR_OR_NULL

Replace IS_ERR_OR_NULL with IS_ERR on clk_get results.
Signed-off-by: default avatarTony Prisk <linux@prisktech.co.nz>
Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d322bb91
...@@ -715,7 +715,7 @@ static int g2d_probe(struct platform_device *pdev) ...@@ -715,7 +715,7 @@ static int g2d_probe(struct platform_device *pdev)
} }
dev->clk = clk_get(&pdev->dev, "sclk_fimg2d"); dev->clk = clk_get(&pdev->dev, "sclk_fimg2d");
if (IS_ERR_OR_NULL(dev->clk)) { if (IS_ERR(dev->clk)) {
dev_err(&pdev->dev, "failed to get g2d clock\n"); dev_err(&pdev->dev, "failed to get g2d clock\n");
return -ENXIO; return -ENXIO;
} }
...@@ -727,7 +727,7 @@ static int g2d_probe(struct platform_device *pdev) ...@@ -727,7 +727,7 @@ static int g2d_probe(struct platform_device *pdev)
} }
dev->gate = clk_get(&pdev->dev, "fimg2d"); dev->gate = clk_get(&pdev->dev, "fimg2d");
if (IS_ERR_OR_NULL(dev->gate)) { if (IS_ERR(dev->gate)) {
dev_err(&pdev->dev, "failed to get g2d clock gate\n"); dev_err(&pdev->dev, "failed to get g2d clock gate\n");
ret = -ENXIO; ret = -ENXIO;
goto unprep_clk; goto unprep_clk;
......
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